summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fieldsRobert Schilling2017-02-226-55/+58
|\ | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * Merge branch 'connection-pool-host' into 'master'Rémy Coutable2017-02-221-1/+6
| |\ | | | | | | | | | | | | Allow setting of a custom connection pool host See merge request !9445
| | * Allow setting of a custom connection pool hostYorick Peterse2017-02-221-1/+6
| | | | | | | | | | | | | | | | | | | | | This allows you to set a custom host when calling Gitlab::Database.create_connection_pool. This is necessary for load balancing as in this case we want to inherit all settings except for the hostname.
| * | Merge branch '27032-add-a-house-keeping-api-call' into 'master' Rémy Coutable2017-02-221-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add housekeeping endpoint for Projects API Closes #27032 See merge request !9421
| | * | Add housekeeping endpoint for Projects APIMark Fletcher2017-02-221-0/+13
| | | |
| * | | Merge branch 'zj-fix-slash-command-labels' into 'master' Douwe Maan2017-02-221-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chat slash commands show labels correctly Closes #28358 See merge request !9408
| | * | | Chat slash commands show labels correctlyzj-fix-slash-command-labelsZ.J. van de Weg2017-02-211-1/+1
| | |/ /
| * | | Merge branch 'grapify-ci-runners-api' into 'master' Rémy Coutable2017-02-221-26/+18
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Grapify the CI::Runners API See merge request !9440
| | * | Grapify the CI::Runners APIgrapify-ci-runners-apiRobert Schilling2017-02-221-26/+18
| | | |
| * | | Merge branch 'grapify-ci-triggers-api' into 'master' Rémy Coutable2017-02-221-27/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Grapfiy the CI::Triggers API See merge request !9439
| | * | | Grapfiy the CI::Triggers APIgrapify-ci-triggers-apiRobert Schilling2017-02-221-27/+16
| | |/ /
| * | | Merge branch '26087-asciidoc-cicd-badges-snippet' into 'master'Rémy Coutable2017-02-221-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add AsciiDoc snippet for CI/CD Badges Closes #26087 See merge request !9164
| | * | | Add AsciiDoc snippet for CI/CD BadgesJan Christophersen2017-02-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds CI/CD Badges Snippets for AsciiDoc as requested in #26087. I've however run into an issue in highlighting the snippet, it seems as if AsciiDoc is currently not being highlighted properly (displayed as plaintext) Add testcase for to_asciidoc Update test case for Badges list
* | | | | Remove deprecated `upvotes` and `downvotes` from the notes APIRobert Schilling2017-02-226-5/+206
|/ / / /
* | | | Merge branch '22132-rename-branch-name-params-to-branch' into 'master' Rémy Coutable2017-02-226-11/+355
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize branch name params as `branch` on V4 API Closes #22132 See merge request !8936
| * | | | Change branch_name param to branch throughout V4 API22132-rename-branch-name-params-to-branchOswaldo Ferreira2017-02-216-11/+355
| | | | |
* | | | | Merge branch 'api-subscription-restful' into 'master' Sean McGivern2017-02-223-2/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Make subscription API more RESTfuL Closes #28327 See merge request !9325
| * | | | | API: Make subscription API more RESTfuLRobert Schilling2017-02-213-2/+56
| | | | | |
* | | | | | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-226-8/+35
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spam check and reCAPTCHA improvements Closes #28093 See merge request !9248
| * | | | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-editOswaldo Ferreira2017-02-216-8/+35
| | |_|_|/ | |/| | |
* | | | | Merge branch 'dm-no-more-andor' into 'master'Robert Speicher2017-02-224-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | No more and/or See merge request !9428
| * | | | | No more and/orDouwe Maan2017-02-214-4/+4
| | | | | |
* | | | | | Merge branch '26881-backup-fails-if-data-changes' into 'master' Douwe Maan2017-02-211-1/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy data before compression to prevent 'file changed as we read it' Closes #26881 See merge request !8728
| * | | | | # This is a combination of 2 commits.Drew Blessing2017-02-211-1/+16
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # This is the 1st commit message: Add `copy` backup strategy to combat file changed errors The backup Rake task used to stream data directly from the live data directory into the backup. Under many circumstances this worked OK. However, really active instances would experience a 'file changed as we read it' error - especially with data like the registry. This now copies the data first, then compresses it. It will take a bit more disk space while the backup is in progress, but it's a necessary thing. # The commit message #2 will be skipped: # Add env var
* | | | | Merge branch '1363-redo-mailroom-support' into 'master' Douwe Maan2017-02-211-2/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Redo internals of Incoming Mail Support See merge request !9385
| * | | | Fix incomming email check task to use same patch we did in mail_room1363-redo-mailroom-supportGabriel Mazetto2017-02-211-2/+5
| | | | |
* | | | | Merge branch 'rename-retry-failed-pipeline-to-retry' into 'master' Filipa Lacerda2017-02-211-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename retry failed button on pipeline page to just retry See merge request !9369
| * | | | | fixed specs + docsdimitrieh2017-02-201-2/+2
| | | | | |
* | | | | | Merge branch 'hash-concurrent-foreign-key-names' into 'master'Rémy Coutable2017-02-211-1/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Hash concurrent foreign key names similar to Rails See merge request !9415
| * | | | | Hash concurrent foreign key names similar to Railshash-concurrent-foreign-key-namesYorick Peterse2017-02-211-1/+10
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was initially not implemented simply because I forgot about the size limit of constraint names in PostgreSQL (63 bytes). Using the old technique we can't add foreign keys for certain tables. For example, adding a foreign key on protected_branch_merge_access_levels.protected_branch_id would lead to the following key name: fk_protected_branch_merge_access_levels_protected_branches_protected_branch_id This key is 78 bytes long, thus violating the PostgreSQL size requirements. The hashing strategy is copied from Rails' foreign_key_name() method, which unfortunately is private and subject to change without notice.
* | | | | Backport Todos API to V3api-todos-restfulRobert Schilling2017-02-212-0/+29
| | | | |
* | | | | API: Use POST requests to mark todos as doneRobert Schilling2017-02-211-2/+4
|/ / / /
* | | | Merge branch '26315-unify-labels-filter-behavior' into 'master' Rémy Coutable2017-02-201-11/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify issues search behavior by always filtering when ALL labels matches Closes #26315 See merge request !8849
| * | | | Unify issues search behavior by always filtering when ALL labels matches26315-unify-labels-filter-behaviorOswaldo Ferreira2017-02-201-11/+3
| | | | |
* | | | | Reuse User#find_by_any_email on UserFormatter#find_by_emailDouglas Barbosa Alexandre2017-02-201-10/+2
| | | | |
* | | | | Use leading periods on UserFormatter#find_by_external_uidDouglas Barbosa Alexandre2017-02-201-2/+3
| | | | |
* | | | | Add a simple cache for Gitlab::GithubImport::Client#userDouglas Barbosa Alexandre2017-02-201-0/+8
| | | | |
* | | | | GitHub Importer - Find users based on their email addressDouglas Barbosa Alexandre2017-02-205-36/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The returned email by the GitHub API is the user's publicly visible email address (or null if the user has not specified a public email address in their profile)
* | | | | Merge branch 'api-star-restful' into 'master'Rémy Coutable2017-02-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` Closes #28328 See merge request !9328
| * | | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`api-star-restfulRobert Schilling2017-02-201-1/+1
| | |/ / | |/| |
* | | | Merge branch 'fix-grammar' into 'master' Robert Speicher2017-02-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix some grammar in the API docs See merge request !9379
| * | | | Fix some grammar in the API docsRobert Schilling2017-02-201-2/+2
| | | | |
* | | | | Merge branch 'api-post-block' into 'master' Sean McGivern2017-02-202-2/+34
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | API: Use POST to (un)block a user Closes #14596 See merge request !9371
| * | | | API: Use POST to (un)block a userapi-post-blockRobert Schilling2017-02-202-2/+34
| |/ / /
* | | | Use grape validation for datesapi-grape-datetimeRobert Schilling2017-02-202-21/+2
|/ / /
* | | API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`api-remove-deploy-key-disableRobert Schilling2017-02-201-19/+3
|/ /
* | Merge branch 'add-additional-checks-to-ca-data' into 'master' Jacob Schatz2017-02-187-0/+28
|\ \ | | | | | | | | | | | | Small improvements for Cycle Analytics See merge request !9153
| * | Restore exposure of legend property for eventsAlfredo Sumaran2017-02-107-0/+28
| |/
* | Merge branch 'add-yarn-documentation' into 'master' Clement Ho2017-02-175-24/+62
|\ \ | | | | | | | | | | | | Update documentation to include yarn in our dependencies See merge request !9316
| * \ Merge branch 'master' into add-yarn-documentationMike Greiling2017-02-166-35/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (73 commits) fix typo in node section move "Install node modules" step before "Migrate DB" within update process Renders pagination again for pipelines table update migration docs for 8.17 to include minimum node version Add CHANGELOG file Fix positioning of top scroll button add space between ci text and commit sha in Merge Request widget Do not use single quote in headings as it breaks docs.gitlab.com Fix broken test Update services templates docs Simplify Pages admin source docs Simplify Pages admin Omnibus docs Fix error in MR widget after /merge slash command Remove arrow icon from folders Create util to handle pagination transformation Wrap long Project and Group titles Changes after review Changes after review Rename storePagination to setPagination Transforms startTimeAgoLoops into a static method so we can reuse it instead of have 2 ...
View Lorry Controller Status