summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* wordingMark Chao2018-06-061-2/+2
|
* Merge branch '45821-avatar_api' into 'master'Rémy Coutable2018-06-063-0/+28
|\ | | | | | | | | | | | | Add Avatar API Closes #45821 See merge request gitlab-org/gitlab-ce!19121
| * Add Avatar APIImre2018-06-063-0/+28
| |
* | Merge branch '25045-add-variables-to-post-pipeline-api' into 'master'Grzegorz Bizon2018-06-061-1/+6
|\ \ | | | | | | | | | | | | | | | | | | Resolve "POST api/v4/projects/:id/pipeline should accept variables" Closes #25045 See merge request gitlab-org/gitlab-ce!19124
| * | Removes variables from pipelines apiJacopo2018-06-051-1/+0
| | |
| * | Review 1Jacopo2018-06-011-1/+5
| | |
| * | Rename variables_attributes => variables and adds spec for exclude/only optionJacopo2018-06-011-2/+2
| | |
| * | Adds variables to POST api/v4/projects/:id/pipelineJacopo2018-06-012-0/+2
| | |
* | | Merge branch 'sh-fix-events-nplus-one' into 'master'Rémy Coutable2018-06-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Eliminate N+1 queries with authors and push_data_payload in Events API See merge request gitlab-org/gitlab-ce!19347
| * | | Eliminate N+1 queries with authors and push_data_payload in Events APIStan Hu2018-06-051-0/+1
| | | |
* | | | Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-052-2/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
| * | | Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-012-2/+5
| |/ / | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751
* | | Merge branch 'sh-fix-pipeline-jobs-nplus-one' into 'master'Rémy Coutable2018-06-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Eliminate N+1 queries for CI job artifacts in /api/projects/:id/pipelines/:pipeline_id/jobs See merge request gitlab-org/gitlab-ce!19353
| * | | Eliminate N+1 queries for CI job artifacts in ↵sh-fix-pipeline-jobs-nplus-oneStan Hu2018-06-041-0/+1
| | | | | | | | | | | | | | | | /api/projects/:id/pipelines/:pipeline_id/jobs
| * | | Remove N+1 query for author in issues APIStan Hu2018-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was being masked by the statement cache because only one author was used per issue in the test.. Also adds support for an Rspec matcher `exceed_all_query_limit`.
* | | | Merge branch 'presigned-multipart-uploads' into 'master'Grzegorz Bizon2018-06-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Support presigned multipart uploads See merge request gitlab-org/gitlab-ce!18855
| * | | | Support presigned multipart uploadsKamil Trzciński2018-06-041-1/+1
| | | | |
* | | | | Merge branch 'sh-add-uncached-query-limiter' into 'master'Rémy Coutable2018-06-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Remove N+1 query for author in issues API See merge request gitlab-org/gitlab-ce!19345
| * | | | Remove N+1 query for author in issues APIsh-add-uncached-query-limiterStan Hu2018-06-041-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | This was being masked by the statement cache because only one author was used per issue in the test.. Also adds support for an Rspec matcher `exceed_all_query_limit`.
* | | | Add ability to search wiki titlesFrancisco Javier López2018-06-041-3/+1
| |/ / |/| |
* | | Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-oneStan Hu2018-06-031-1/+1
|/ / | | | | | | | | Now that we are checking `MergeRequest#for_fork?`, we also need the source project preloaded for a merge request.
* | Merge branch '46010-add-more-validations-for-runners-and-runner-type' into ↵Kamil Trzciński2018-06-012-11/+11
|\ \ | |/ |/| | | | | | | | | 'master' Improve validations for Ci::Runner#runner_type See merge request gitlab-org/gitlab-ce!18901
| * Improve Runners API validationsKamil Trzciński2018-05-311-1/+1
| |
| * Improve runner registration APIKamil Trzciński2018-05-311-7/+9
| |
| * Improve `Ci::Runner#assign_to` to return a flag whether it succeeded or notKamil Trzciński2018-05-311-3/+1
| |
* | Add merge requests list endpoint for groupsFelipe Artur2018-05-311-17/+32
| |
* | Merge branch 'sh-fix-issue-api-perf-n-plus-one' into 'master'Nick Thomas2018-05-311-1/+1
|\ \ | |/ |/| | | | | Eliminate cached N+1 queries for projects in Issue API See merge request gitlab-org/gitlab-ce!19269
| * Eliminate cached N+1 queries for projects in Issue APIStan Hu2018-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CE, every `Issue` entity is also a `ProjectEntity`, which calls `entity&.project.try(:id)` to show the project ID. In an API request with 100 issues, this would hit the Rails statement cache 100 times for the same project and cause unnecessary overhead as related models would also be loaded. In EE, we call `Issue#supports_weight?` for each issue, which then calls `project&.feature_available?(:issue_weights)`. If the project is not preloaded, this incurs additional overhead, as each individual Project object has to be queried. This can lead to a significant performance hit. In loading the CE project with 100 issues, this contributed to at least 22% of the load time. See https://gitlab.com/gitlab-org/gitlab-ce/issues/47031 for why testing this is a bit tricky.
* | Merge branch 'fj-36819-remove-v3-api' into 'master'Douwe Maan2018-05-3139-5362/+5
|\ \ | |/ |/| | | | | | | | | Removal of API v3 from the codebase Closes #36819 See merge request gitlab-org/gitlab-ce!18970
| * Removed API endpoint and specsfj-36819-remove-v3-apiFrancisco Javier López2018-05-3039-5362/+5
| |
* | Add missing usage_ping_enabled to API settingsStan Hu2018-05-301-0/+1
|/ | | | Identified while resolving conflicts in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5906
* Merge branch 'dm-api-projects-members-preload' into 'master'Robert Speicher2018-05-302-16/+20
|\ | | | | | | | | Only preload member records for the relevant projects/groups/user in projects API See merge request gitlab-org/gitlab-ce!18945
| * Only preload member records for the relevant projects/groups/user in ↵dm-api-projects-members-preloadDouwe Maan2018-05-302-16/+20
| | | | | | | | projects API
* | Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-301-1/+1
|\ \ | |/ |/| | | | | | | | | Replace grape-route-helpers with our own grape-path-helpers Closes #45718 See merge request gitlab-org/gitlab-ce!19240
| * Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes: 1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21 2. Fixes some broken specs and code for Grape 1.0+ 3. Optimizes the generation of paths by bringing in @dblessing's HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793 Closes #45718
* | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-304-10/+13
|\ \ | |/ |/| | | | | | | | | Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956
| * Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-294-10/+13
| |
* | Merge remote-tracking branch 'dev/master'Mayra Cabrera2018-05-291-3/+3
|\ \
| * \ Merge branch 'security-dm-delete-deploy-key' into 'master'Mayra Cabrera2018-05-291-3/+3
| |\ \ | | | | | | | | | | | | | | | | [master] Fix API to remove deploy key from project instead of deleting it entirely See merge request gitlab/gitlabhq!2379
| | * | Fix API to remove deploy key from project instead of deleting it entirelyDouwe Maan2018-05-041-3/+3
| | | |
* | | | Merge branch '46758-fallout-of-cacheable-attribute' into 'master'Douwe Maan2018-05-292-4/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache Closes #46758 See merge request gitlab-org/gitlab-ce!19144
| * | | | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set ↵Rémy Coutable2018-05-292-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when retrieved from cache Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '44602-clarify-update-docs-text-about-restrictions' into 'master'Achilleas Pipinellis2018-05-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Resolve "Clarify/Update docs/text about restrictions." See merge request gitlab-org/gitlab-ce!17970
| * | | | include groups in descriptionDavin Walker2018-05-281-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'add-artifacts_expire_at-to-api' into 'master'Grzegorz Bizon2018-05-291-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expose artifacts_expire_at field for job entity in api See merge request gitlab-org/gitlab-ce!18872
| * | | | Expose artifacts_expire_at field for job entity in apiSemyon Pupkov2018-05-261-0/+1
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/45798
* | | | | Log queue duration for Grape API callssh-tag-queue-duration-api-callsStan Hu2018-05-281-1/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | This mimics the same thing the RailsQueueDuration does for Rails controller requests and will help diagnose issues with API delays. Closes #46601
* | | | Merge branch 'ignore-writing-trace-if-it-already-archived' into 'master'Kamil Trzciński2018-05-281-2/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Disallow updating job status if the job is not running Closes #46383 See merge request gitlab-org/gitlab-ce!19101
| * | | Revert correctlyShinya Maeda2018-05-281-2/+2
| | | |
| * | | Disallow updating job stauts if it's not runningShinya Maeda2018-05-281-0/+1
| | | |