summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Grapify the users APIgrapify-users-apiRobert Schilling2016-11-211-258/+250
|
* Merge branch 'grapify-to-h' into 'master' Rémy Coutable2016-11-143-7/+9
|\ | | | | | | | | Use to_h to convert params to a hash See merge request !7406
| * Use #to_h to convert params to a hashgrapify-to-hRobert Schilling2016-11-143-7/+9
| |
* | Merge branch 'grapify-subscription-api' into 'master' Rémy Coutable2016-11-141-23/+14
|\ \ | |/ |/| | | | | | | | | | | | | Grapify subscription API ## What are the relevant issue numbers? Related to #22928 See merge request !7380
| * Grapify subscription APIRobert Schilling2016-11-141-23/+14
| |
* | Merge branch 'grapify-token-api' into 'master' Rémy Coutable2016-11-101-46/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Grapify triggers API ## What are the relevant issue numbers? Related to #22928 See merge request !7378
| * | Grapify token APIRobert Schilling2016-11-101-46/+30
| | |
* | | Merge branch 'grapify-milestone-api' into 'master' Rémy Coutable2016-11-101-54/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify milestones API ## What are the relevant issue numbers? Related to #22928 See merge request !7373
| * | | Grapify milestones APIgrapify-milestone-apiRobert Schilling2016-11-101-54/+57
| | |/ | |/|
* | | Merge branch 'grapify-runners-api' into 'master' Rémy Coutable2016-11-101-53/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify runners API ## What are the relevant issue numbers? Related to #22928 See merge request !7377
| * | | Grapify runners APIRobert Schilling2016-11-101-53/+64
| |/ /
* | | Merge branch 'grapify-session-api' into 'master' Rémy Coutable2016-11-101-10/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the session API ## What are the relevant issue numbers? Related to #22928 See merge request !7381
| * | | Grapify the session APIgrapify-session-apiRobert Schilling2016-11-091-10/+9
| |/ /
* | | Merge branch 'feature/api_owned_resource' into 'master' Sean McGivern2016-11-101-0/+10
|\ \ \ | |_|/ |/| | | | | | | | Add api endpoint `/groups/owned` See merge request !7103
| * | Added API endpoint groups/ownedBorja Aparicio2016-11-081-0/+10
| | |
* | | Add query param to filter users on 'external' & 'blocked' type on APIYatish Mehta2016-11-081-1/+6
| | |
* | | Merge branch 'fix-systemhook-api' into 'master' Rémy Coutable2016-11-081-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | API: Return 400 when creating a systemhook fails Closes #23335 See merge request !7350
| * | API: Return 400 when creating a systemhook failsRobert Schilling2016-11-081-1/+1
| |/
* | Expose Label id to APIRares Sfirlogea2016-11-071-1/+1
| | | | | | | | | | | | [e44da1c] Add Label API expected keys to tests [ac929c8] Update Label API documentation
* | Ability to update labels priority via APIRobert Schilling2016-11-072-13/+31
|/
* Merge remote-tracking branch 'origin/labels-api'Rémy Coutable2016-11-041-3/+3
|\ | | | | | | | | | | See merge request !7014 Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Return conflict error in label API when title is taken by group labellabels-apiDouwe Maan2016-10-201-3/+3
| |
* | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-042-3/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add setting to only allow merge requests to be merged when all discussions are resolved _Originally opened at !6385 by @rodolfoasantos._ - - - ## What does this MR do? Based on #20968 this merge request adds setting only to allow merge requests to be merged when all discussions are resolved. ## Are there points in the code the reviewer needs to double check? Check if there are other points to add the resolved discussion setting ## Why was this MR needed? Add the possibility to configure the project to only accept merge request when all discussions are resolved ## Screenshots ![only_allow_merge_if_all_discussions_are_resolved](/uploads/9388db9421da0214590ffab6fb29f985/only_allow_merge_if_all_discussions_are_resolved.png) ![only_allow_merge_if_all_discussions_are_resolved_msg](/uploads/b1bba0c72ad67d3a1b34718baa08526e/only_allow_merge_if_all_discussions_are_resolved_msg.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #20968 See merge request !7125
| * | Add setting to only allow merge requests to be merged when all discussions ↵Rodolfo Santos2016-11-042-3/+7
| | | | | | | | | | | | | | | | | | are resolved Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'zj-grapify-project-hooks' into 'master' Rémy Coutable2016-11-041-84/+69
|\ \ \ | |/ / |/| | | | | | | | GrapeDSL for project hooks See merge request !6963
| * | Move shared params to a helperzj-grapify-project-hooksZ.J. van de Weg2016-11-041-39/+19
| | |
| * | GrapeDSL for project hooksZ.J. van de Weg2016-11-041-69/+74
| | |
* | | Merge branch 'backport-ee-js-groups-api' into 'master' Robert Speicher2016-11-041-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport Group API code that was added in EE only Group API code that was added in EE only. /cc @vsizov See merge request !7205
| * | | Backport Group API code that was added in EE onlybackport-ee-js-groups-apiRémy Coutable2016-10-311-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Allow multiple repository storage shards to be enabled, and automatically ↵Nick Thomas2016-11-042-2/+3
| |/ / |/| | | | | | | | round-robin between them
* | | Merge branch 'zj-expose-system-hooks' into 'master' Rémy Coutable2016-11-032-6/+10
|\ \ \ | | | | | | | | | | | | | | | | Expose more info for SystemHooks See merge request !6964
| * | | Update docs and unexpose tokenZeger-Jan van de Weg2016-11-022-1/+2
| | | |
| * | | Be able to POST subscriptions for system hooksZ.J. van de Weg2016-10-311-2/+6
| | | |
| * | | Expose more data on the SystemHooks APIZ.J. van de Weg2016-10-311-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now exposed: - push_events - tag_push_events - enable_ssl_verification - token Fixes gitlab-org/gitlab-ce#23307
* | | | Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master' Rémy Coutable2016-11-021-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds support for the `token` attribute in the project hook API. Feature requested on a dependant project: https://github.com/gpocentek/python-gitlab/issues/170 See merge request !7220
| * | | | Ensure hook tokens are write-only in the APIgpocentek/gitlab-ce-api-webhook-tokenSean McGivern2016-11-011-1/+1
| | | | |
| * | | | Add support for token attr in project hooks APIGauvain Pocentek2016-11-012-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | The UI allows to define a token to validate payload on the target URL, this patch adds the feature to the API.
* | | | | Fix project features default valuesFelipe Artur2016-11-011-8/+2
|/ / / /
* | | | Merge branch 'zj-grape-branches' into 'master' Rémy Coutable2016-11-011-66/+57
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | GrapeDSL for branches endpoints No changelog item as it doesn't change behaviour Cherry-picket from !6330 See merge request !6630
| * | | GrapeDSL for branches endpointszj-grape-branchesZ.J. van de Weg2016-10-311-66/+57
| |/ /
* | | Merge branch '22271-drone-tag-pipeline-build' into 'master' Douwe Maan2016-10-311-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix lightweight tags not processed correctly by GitTagPushService ## What does this MR do? Fix lightweight tags not processed correctly by GitTagPushService ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Lightweight tags were being processed incorrectly, causing tag triggers to receive wrong information and not function properly. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22271 See merge request !6532
| * | Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | When we updated gitlab_git to 10.4.1, `tag.target` changed from pointing to the sha of the tag to the sha of the commit the tag points to. The problem is that only annotated tags have `object_sha`s, lightweight tags don't (it's nil), so (only) in their case we still need to use `tag.target`.
* | | Merge branch 'dz-internal-api-fullpath' into 'master' Dmitriy Zaporozhets2016-10-281-4/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make internal api work with full repo path and name ## What does this MR do? Make internal api work with full repo path and name ## Why was this MR needed? So we can pass full repository path on filesystem from gitlab-shell instead of extracted one. We need this for nested groups support where project is can be nested under several groups. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7148
| * | Refactor storage path extraction from full repo pathdz-internal-api-fullpathDmitriy Zaporozhets2016-10-281-6/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Make internal api work with full repo path instead of nameDmitriy Zaporozhets2016-10-271-4/+14
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | API: Fix booleans not recognized as such when using the `to_boolean` helper23890-api-should-accepts-booleanRémy Coutable2016-10-271-0/+1
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fixes various errors when adding deploy keys caused by not exiting the ↵Joshua Welsh2016-10-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | control flow. When adding a deploy key that already exists in the project the existing key would not be returned, resulting in an attempt to create a new one, which in turn caused a 500 error due to an ActiveRecord exception. When adding a deploy key that exists within another project the key would be joined to the project, but would also attempt to create a new one, which resulted in a 400 error due to the key already existing. Fixes #22741 Fixes #21754 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'grapify-tags' into 'master' Rémy Coutable2016-10-261-49/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify tags API ## What does this MR do? Add the Grape-DSL to the tags API. ## Are there points in the code the reviewer needs to double check? The delete endpoint only has a description but no success entity because we don't have one. We only return the branch name as JSON. Should I do something else? ## What are the relevant issue numbers? Related to #22928 See merge request !6860
| * | Grapify tags APIgrapify-tagsRobert Schilling2016-10-261-49/+45
| | |
* | | Get rid of extra .page callAirat Shigapov2016-10-241-2/+1
| | |