summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/DotPositionDouwe Maan2017-02-2318-71/+71
* Remove last merge_request endpointRobert Schilling2017-02-231-1/+0
* Merge branch 'api-notes-entity-fields' into 'master' Sean McGivern2017-02-236-5/+206
|\
| * Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fieldsRobert Schilling2017-02-226-55/+58
| |\
| * | Remove deprecated `upvotes` and `downvotes` from the notes APIRobert Schilling2017-02-226-5/+206
* | | Rebase to master for avoiding failing testsGeorge Andrinopoulos2017-02-231-1/+1
* | | Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into 'mas...Robert Speicher2017-02-221-1/+1
|\ \ \ | |_|/ |/| |
| * | Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag improve-ee_compat_check-by-using-git-apply-3way-flagRémy Coutable2017-02-221-1/+1
* | | Merge branch 'connection-pool-host' into 'master'Rémy Coutable2017-02-221-1/+6
|\ \ \ | |/ / |/| |
| * | Allow setting of a custom connection pool hostYorick Peterse2017-02-221-1/+6
* | | Merge branch '27032-add-a-house-keeping-api-call' into 'master' Rémy Coutable2017-02-221-0/+13
|\ \ \
| * | | 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 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 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 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 BadgesJan Christophersen2017-02-201-0/+4
* | | | Merge branch '22132-rename-branch-name-params-to-branch' into 'master' Rémy Coutable2017-02-226-11/+355
|\ \ \ \
| * | | | 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 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 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/orDouwe Maan2017-02-214-4/+4
* | | | | | Merge branch '26881-backup-fails-if-data-changes' into 'master' Douwe Maan2017-02-211-1/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | # This is a combination of 2 commits.Drew Blessing2017-02-211-1/+16
| | |_|/ / | |/| | |
* | | | | Merge branch '1363-redo-mailroom-support' into 'master' Douwe Maan2017-02-211-2/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|\ \ \ \ \
| * | | | | 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 Railshash-concurrent-foreign-key-namesYorick Peterse2017-02-211-1/+10
| | |_|/ / | |/| | |
* | | | | 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 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
* | | | | 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`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 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 userapi-post-blockRobert Schilling2017-02-202-2/+34
| |/ / /