summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
* | | | Merge branch 'zj-internal-repo-path' into 'master'Grzegorz Bizon2018-05-282-7/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Don't pass the repository path to Gitlab Shell See merge request gitlab-org/gitlab-ce!19011
| * | | Return '/' as a bogus repo path to gitlab-shellzj-internal-repo-pathJacob Vosmaer2018-05-251-1/+5
| | | |
| * | | Don't pass the repository path to Gitlab ShellZeger-Jan van de Weg2018-05-172-7/+1
| | | | | | | | | | | | | | | | This isn't a requirement, and removes deprecated method calls
* | | | Merge branch ↵Rémy Coutable2018-05-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46740-projectmilestones-setting-start_date-via-the-api-requires-a-second-parameter' into 'master' Resolve "ProjectMilestones: Setting start_date via the API requires a second parameter" Closes #46740 See merge request gitlab-org/gitlab-ce!19133
| * | | | Allow start_date as only parameter when updating Milestone via APIMark Fletcher2018-05-241-1/+1
| | |/ / | |/| |
* | | | Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repoRémy Coutable2018-05-242-2/+2
|/ / / | | | | | | | | | | | | | | | without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Use ApplicationSetting.current_without_cache instead of ↵Rémy Coutable2018-05-232-2/+2
| | | | | | | | | | | | | | | | | | ApplicationSetting.current where applicable Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'ab-42194-keyset-pagination' into 'master'Yorick Peterse2018-05-221-40/+213
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API: Keyset pagination support Closes #45756 See merge request gitlab-org/gitlab-ce!18584
| * | | Add feature-flag for keyset pagination.ab-42194-keyset-paginationAndreas Brandl2018-05-211-1/+1
| | | |
| * | | Add keyset pagination for API calls.Andreas Brandl2018-05-211-5/+165
| | | | | | | | | | | | | | | | Closes #45756.
| * | | Refactor and extract DefaultPaginationStrategy.Andreas Brandl2018-05-211-43/+56
| | | |
* | | | Expose readme url in Project APIImre Farkas2018-05-221-1/+1
| | | |
* | | | Fix `expose_url` helper does not include custom base url if it is setFrancisco Javier López2018-05-221-2/+7
|/ / /
* | | Merge branch 'create-live-trace-only-if-job-is-complete' into 'master'Kamil Trzciński2018-05-211-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Append trace chunk only if job is running Closes #46383 See merge request gitlab-org/gitlab-ce!18969
| * | | Add the same gurad clause with artifacts uplaodingShinya Maeda2018-05-211-1/+2
| | | |
| * | | Append trace only if the job is runningShinya Maeda2018-05-211-1/+1
| | | |
* | | | Merge branch '44799-api-naming-issue-scope' into 'master'Rémy Coutable2018-05-212-8/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "API naming for issue scope" Closes #44799 See merge request gitlab-org/gitlab-ce!18935
| * | | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scopeMark Chao2018-05-212-8/+10
| | | | | | | | | | | | | | | | Deprecate corresponding dash versions created-by-me and assigned-to-me
* | | | Resolve "Expand API: Render an arbitrary Markdown document"blackst0ne2018-05-182-0/+34
| | | |
* | | | Merge branch 'sh-fix-grape-logging-status-code' into 'master'Douwe Maan2018-05-181-8/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix api_json.log not always reporting the right HTTP status code See merge request gitlab-org/gitlab-ce!19028
| * | | | Fix api_json.log not always reporting the right HTTP status codeStan Hu2018-05-171-8/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in https://github.com/aserafin/grape_logging/issues/45, if a Grape error is caught by the handlers and a different return code is returned, then the api_json.log would have a 500 error code instead of the right value. Inserting the GrapeLogging middleware after the Grape middleware fixes this problem. Seen in https://gitlab.com/gitlab-com/infrastructure/issues/4249
* | | | Move API group deletion to SidekiqStan Hu2018-05-182-3/+6
|/ / /
* | | Merge branch 'jprovazn-remote-upload-destroy' into 'master'Kamil Trzciński2018-05-162-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Delete remote uploads Closes #45425 See merge request gitlab-org/gitlab-ce!18698
| * | | Whitelisted query limits for group destroy APIjprovazn-remote-upload-destroyJan Provaznik2018-05-162-0/+2
| | | |
* | | | Remove unnecessary runner.is_shared? checks in api because they are handled ↵Dylan Griffith2018-05-161-2/+0
| | | | | | | | | | | | | | | | by policy