summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Grapify the files APIgrapify-files-apiRobert Schilling2016-11-301-93/+60
|
* Merge branch 'zj-expose-coverage-pipelines' into 'master' Rémy Coutable2016-11-251-0/+1
|\ | | | | | | | | | | | | Expose coverage on GET pipelines/:id Closes gitlab-org/gitlab-ce#24801 See merge request !7670
| * Expose coverage on GET pipelines/:idzj-expose-coverage-pipelinesZ.J. van de Weg2016-11-251-0/+1
| | | | | | | | | | The coverage wasn't exposed yet, now it is but only for detailed requests to save queries on the database.
* | Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse2016-11-257-12/+28
|\ \ | | | | | | | | | | | | Resolve "Reduce queries in API::Helpers#find_project" See merge request !7714
| * | API: Introduce `#find_group!` which also check access permission22373-reduce-queries-in-api-helpers-find_projectRémy Coutable2016-11-244-7/+15
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | API: Introduce `#find_project!` which also check access permissionRémy Coutable2016-11-242-8/+11
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | API: Use `#find_project` in API::Triggers and API::ServicesRémy Coutable2016-11-242-2/+2
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Make API::Helpers find a project with only one queryRémy Coutable2016-11-241-1/+6
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Don't convert data which already is the target typeapi-no-convertRobert Schilling2016-11-244-4/+4
|/ /
* | Merge branch 'api-delete-group-share' into 'master' Rémy Coutable2016-11-231-0/+13
|\ \ | | | | | | | | | | | | | | | | | | API: Add endpoint to delete a group share Closes #24771 See merge request !7662
| * | API: Add endpoint to delete a group shareapi-delete-group-shareRobert Schilling2016-11-231-0/+13
| | |
* | | Merge branch 'grapify-sidekiq-metric-api' into 'master' Rémy Coutable2016-11-231-32/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Grapify the sidekiq metrics API Related to #22928 See merge request !7699
| * | | Grapify the sidekiq metrics APIRobert Schilling2016-11-231-32/+4
| |/ /
* | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-232-1/+3
| | |
* | | Merge branch 'fix-api-iid-filter' into 'master' Rémy Coutable2016-11-222-6/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix IID filter for merge requests and milestones I updated the example in the docs and added a test. The milestones API was also broken for the same reason. Related to !7358 and !7373 See merge request !7648
| * | | Fix IID filter for merge requests and milestonesRobert Schilling2016-11-222-6/+4
| |/ /
* | | Merge branch ↵Rémy Coutable2016-11-227-12/+42
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | '23532-define-common-helper-for-describe-pagination-params-in-api' into 'master' Add concern for reuse pagination params declaration in API Closes #23532 See merge request !7646
| * | Define common helper for describe pagination params in apiSemyon Pupkov2016-11-227-12/+42
| | |
* | | Avoid helper call with default parametersavoid-api-helper-callRobert Schilling2016-11-221-1/+1
| |/ |/|
* | Merge branch '24730-broken-master' into 'master' Robert Speicher2016-11-221-4/+5
|\ \ | | | | | | | | | | | | | | | | | | Fix StrongAttibutes error with Ruby 2.1 Closes #24730 See merge request !7625
| * | Fix StrongAttibutes error with Ruby 2.124730-broken-masterRémy Coutable2016-11-211-4/+5
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | 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