summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Grapify the projects snippet APIgrapify-project-snippet-apiRobert Schilling2016-11-211-78/+78
|
* Merge branch 'grapify-users-api' into 'master' Rémy Coutable2016-11-211-257/+249
|\ | | | | | | | | | | | | | | | | | | | | Grapify the users API Certain endpoints return different entities based on which user issues the request. Right now, I am not aware how to specify multiple entities as part of the description block of the endpoint. @rymai Do you know something about that. ## What are the relevant issue numbers? Related to #22928 See merge request !7147
| * Grapify the users APIgrapify-users-apiRobert Schilling2016-11-211-258/+250
| |
* | Merge branch 'create-pipeline-endpoint' into 'master' Rémy Coutable2016-11-211-0/+21
|\ \ | | | | | | | | | | | | | | | | | | Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
| * | Add api endpoint for creating a pipelineIdo Leibovich2016-11-181-0/+21
| | | | | | | | | | | | Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.
* | | Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński2016-11-182-5/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slash command for mattermost Closes #22540 ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - 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) See merge request !7438
| * | | Return a consistent not found messageZ.J. van de Weg2016-11-181-2/+3
| | | | | | | | | | | | | | | | | | | | This prevents leakage of project names on an endpoint which is unauthenticated and thus open to the world.
| * | | Improve style, add more testsZ.J. van de Weg2016-11-182-13/+6
| | | |
| * | | More coverage on service levelZ.J. van de Weg2016-11-182-6/+10
| | | |
| * | | Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-177-56/+79
| |\ \ \
| * | | | More refactoring, push present to base commandZ.J. van de Weg2016-11-171-2/+2
| | | | |
| * | | | Incorporate feedback, improve presenter classZ.J. van de Weg2016-11-171-3/+5
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Make chat authorization to work [ci skip]Kamil Trzcinski2016-11-171-3/+26
| | | | |
* | | | | Merge branch 'grapify-repository-api' into 'master' Rémy Coutable2016-11-181-58/+39
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Grapify repository api See merge request !7534
| * | | | Grapify the repository APIRobert Schilling2016-11-181-58/+39
| | | | |
* | | | | Merge branch 'sort-api-groups' into 'master' Sean McGivern2016-11-171-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Allow sorting groups in API Relates to #20013. See merge request !7529
| * | | | Allow sorting groups in APIsort-api-groupsSean McGivern2016-11-171-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Allow `order_by` and `sort` parameters to `/api/v3/groups.json`. At present, only ordering by name and path is supported, and the default sort is name ascending (alphabetical order).
* | | | Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre2016-11-174-13/+13
| | | |
* | | | Pass project to Entities::Label to check if user is subscribedDouglas Barbosa Alexandre2016-11-172-7/+7
|/ / /
* | | Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern2016-11-162-36/+59
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project paths Closes #24496 See merge request !7480
| * | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-162-36/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-161-16/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-161-16/+1
| | | |
* | | | Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' Sean McGivern2016-11-161-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fix labels API adding missing parameter (current_user) See merge request !7458
| * | | | fix indentationFrancesco Coda Zabetta2016-11-141-7/+7
| | | | |
| * | | | fix labels API adding missing parameter (current_user)Francesco Coda Zabetta2016-11-141-1/+12
| | |_|/ | |/| |
* | | | Merge branch '23584-triggering-builds-from-webhooks' into 'master' Rémy Coutable2016-11-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add ref parameter for triggerring builds with gitlab webhook from other project.Dmitry Poray2016-11-151-1/+1
| | |/ / | |/| |
* | | | Merge branch 'grapify-notes-api' into 'master' Rémy Coutable2016-11-151-67/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the notes API ## What are the relevant issue numbers? Related to #22928 See merge request !7375
| * | | | Grapify the notes APIgrapify-notes-apiRobert Schilling2016-11-151-67/+57
| | | | |
* | | | | Merge branch 'grapify-groups-api' into 'master' Rémy Coutable2016-11-151-82/+74
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the group API ## What are the relevant issue numbers? Related to #22928 See merge request !7359
| * | | | Grapify the group APIRobert Schilling2016-11-151-82/+74
| | |_|/ | |/| |
* | | | Merge branch 'grapify-merge-request-api' into 'master' Rémy Coutable2016-11-151-162/+110
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Grapify the merge request APIgrapify-merge-request-apiRobert Schilling2016-11-151-162/+110
| |/ / /
* | | | Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-152-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-122-2/+4
| | |_|/ | |/| |
* | | | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add button to delete all merged branchesToon Claes2016-11-091-0/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Use declared_params helper in APIgrapify-declared-paramsRobert Schilling2016-11-1412-36/+20
| |_|/ |/| |
* | | 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