Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/api
AgeCommit message (Collapse)Author
2016-11-16Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern
Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project paths Closes #24496 See merge request !7480
2016-11-16Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan
Defer saving project services to the database if there are no user changes ## What does this MR do? It defers saving project services to the database as long as it is possible. It creates a project service when creating a project only if this project service has an active template. After that project services are saved on the first edit. ## Are there points in the code the reviewer needs to double check? - tests that used `build_missing_services` before the change - number of queries executed ## Why was this MR needed? Motivation in #22281 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] 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 it does - 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? Fixes #22281 See merge request !6958
2016-11-16Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas
gitlab-shell v3.6.6 would give project paths like so: * namespace/project gitlab-shell v4.0.0 can give project paths like so: * /namespace1/namespace2/project * /namespace/project * /path/to/repository/storage/namespace1/namespace2/project * /path/to/repository/storage/namespace/project
2016-11-16Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' Sean McGivern
fix labels API adding missing parameter (current_user) See merge request !7458
2016-11-16Defer saving project services to the database if there are no user changesAdam Niedzielski
2016-11-15Merge branch '23584-triggering-builds-from-webhooks' into 'master' Rémy Coutable
Add ref parameter for triggering builds with gitlab webhook from other project. Currently GitLab can trigger builds from external tools like curl. But there is no way to trigger builds with webhook from another GitLab project. Executing webhook like `/projects/:id/trigger/builds?token=TOKEN&ref=master` results in such message from server: ``` 400 No builds created ``` Problem is the ref from request body takes precedence of the ref from query string. System tries to trigger build for nonexistent branch instead of `master`. This is the feature of the Grape framework used to build GitLab api. This MR adds optional `ref` parameter into the api url: ``` /projects/:id/ref/:ref/trigger/builds?token=TOKEN ``` This will lead that the ref in the url will have precedence of the ref inside request body. This solution provides compatibility with current API urls. Closes #23584 See merge request !7022
2016-11-15Merge branch 'grapify-notes-api' into 'master' Rémy Coutable
Grapify the notes API ## What are the relevant issue numbers? Related to #22928 See merge request !7375
2016-11-15Grapify the notes APIRobert Schilling
2016-11-15Merge branch 'grapify-groups-api' into 'master' Rémy Coutable
Grapify the group API ## What are the relevant issue numbers? Related to #22928 See merge request !7359
2016-11-15Add ref parameter for triggerring builds with gitlab webhook from other project.Dmitry Poray
2016-11-15Merge branch 'grapify-merge-request-api' into 'master' Rémy Coutable
Grapify the merge request API Grapfiy the merge request API. I removed the test for checking if the source branch can be changed since this is an unused parameter. IMHO the test does not make sense. ## What are the relevant issue numbers? Related to #22928 See merge request !7358
2016-11-15Grapify the group APIRobert Schilling
2016-11-15Merge branch 'master-recursiveTree' into 'master' Douwe Maan
Issue #4270: Recursive option for files through API ## What does this MR do? - Adds recursive param to tree API request. With this param we can get all repository paths in a single request. - Related [old github pull request](https://github.com/gitlabhq/gitlabhq/pull/9311) ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Requested in #4270 ## Screenshots (if relevant) ## 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 - [x] All builds are passing - [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? Requested in #4270 See merge request !6088
2016-11-15Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan
Add button to delete all merged branches ## What does this MR do? It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs. **Note** ~~This MR is WIP until MR !6408 is merged.~~ ## Are there points in the code the reviewer needs to double check? The UX of the actual "Delete merged branches" button. ## Why was this MR needed? Fixes #21076 ## Screenshots ![Branches page without "Delete all merged" button](/uploads/3a2936a83c3547a0fce92a74af880a2d/Screen_Shot_2016-10-17_at_20.06.30.png) Before: ![Screen_Shot_2016-10-17_at_20.07.11](/uploads/55efcebf4e0a45dbfc70ba4a11ca152c/Screen_Shot_2016-10-17_at_20.07.11.png) After: ## 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 - [x] 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 #21076 See merge request !6449
2016-11-15Grapify the merge request APIRobert Schilling
2016-11-14fix indentationFrancesco Coda Zabetta
2016-11-14fix labels API adding missing parameter (current_user)Francesco Coda Zabetta
2016-11-14Use declared_params helper in APIRobert Schilling
2016-11-14Merge branch 'grapify-to-h' into 'master' Rémy Coutable
Use to_h to convert params to a hash See merge request !7406
2016-11-14Merge branch 'grapify-subscription-api' into 'master' Rémy Coutable
Grapify subscription API ## What are the relevant issue numbers? Related to #22928 See merge request !7380
2016-11-14Use #to_h to convert params to a hashRobert Schilling
2016-11-14Grapify subscription APIRobert Schilling
2016-11-12Issue #4270: Recursive option for files through APIRebeca Méndez
2016-11-10Merge branch 'grapify-token-api' into 'master' Rémy Coutable
Grapify triggers API ## What are the relevant issue numbers? Related to #22928 See merge request !7378
2016-11-10Merge branch 'grapify-milestone-api' into 'master' Rémy Coutable
Grapify milestones API ## What are the relevant issue numbers? Related to #22928 See merge request !7373
2016-11-10Grapify token APIRobert Schilling
2016-11-10Merge branch 'grapify-runners-api' into 'master' Rémy Coutable
Grapify runners API ## What are the relevant issue numbers? Related to #22928 See merge request !7377
2016-11-10Grapify milestones APIRobert Schilling
2016-11-10Grapify runners APIRobert Schilling
2016-11-10Merge branch 'grapify-session-api' into 'master' Rémy Coutable
Grapify the session API ## What are the relevant issue numbers? Related to #22928 See merge request !7381
2016-11-10Merge branch 'feature/api_owned_resource' into 'master' Sean McGivern
Add api endpoint `/groups/owned` See merge request !7103
2016-11-09Add button to delete all merged branchesToon Claes
It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs. Fixes #21076.
2016-11-09Grapify the session APIRobert Schilling
2016-11-08Add query param to filter users on 'external' & 'blocked' type on APIYatish Mehta
2016-11-08Merge branch 'fix-systemhook-api' into 'master' Rémy Coutable
API: Return 400 when creating a systemhook fails Closes #23335 See merge request !7350
2016-11-08Added API endpoint groups/ownedBorja Aparicio
2016-11-08API: Return 400 when creating a systemhook failsRobert Schilling
2016-11-07Expose Label id to APIRares Sfirlogea
[e44da1c] Add Label API expected keys to tests [ac929c8] Update Label API documentation
2016-11-07Ability to update labels priority via APIRobert Schilling
2016-11-04Merge remote-tracking branch 'origin/labels-api'Rémy Coutable
See merge request !7014 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan
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
2016-11-04Merge branch 'zj-grapify-project-hooks' into 'master' Rémy Coutable
GrapeDSL for project hooks See merge request !6963
2016-11-04Add setting to only allow merge requests to be merged when all discussions ↵Rodolfo Santos
are resolved Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04Merge branch 'backport-ee-js-groups-api' into 'master' Robert Speicher
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
2016-11-04Move shared params to a helperZ.J. van de Weg
2016-11-04GrapeDSL for project hooksZ.J. van de Weg
2016-11-04Allow multiple repository storage shards to be enabled, and automatically ↵Nick Thomas
round-robin between them
2016-11-03Merge branch 'zj-expose-system-hooks' into 'master' Rémy Coutable
Expose more info for SystemHooks See merge request !6964
2016-11-02Update docs and unexpose tokenZeger-Jan van de Weg
2016-11-02Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master' Rémy Coutable
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-14 17:57:08 +0300