Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | enable CommonMark as the default | Brett Walker | 2018-06-14 | 1 | -3/+1 |
| | |||||
* | Rails5 fix no implicit conversion of Hash into String. ↵ | Jasper Maes | 2018-06-13 | 1 | -1/+2 |
| | | | | ActionController::Parameters no longer returns an hash in Rails 5 | ||||
* | Resolve "Provide ability to retrieve `visibility` level via Snippets API" | Jan | 2018-06-13 | 1 | -1/+1 |
| | |||||
* | Merge branch '47735-milestone-regression' into 'master' | Phil Hughes | 2018-06-13 | 1 | -0/+4 |
|\ | | | | | | | | | | | | | Resolve "Regressions for assigning group milestone from ancestor" Closes #47735 See merge request gitlab-org/gitlab-ce!19721 | ||||
| * | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regression | Mario de la Ossa | 2018-06-12 | 1 | -0/+4 |
| | | |||||
* | | Restoring user v3 endpoint | Francisco Javier López | 2018-06-13 | 1 | -11/+15 |
| | | |||||
* | | Merge branch 'commits_api_with_stats' into 'master' | Rémy Coutable | 2018-06-13 | 2 | -9/+17 |
|\ \ | |/ |/| | | | | | Added with_stats option to GET /projects/:id/repository/commits (API) See merge request gitlab-org/gitlab-ce!19484 | ||||
| * | Added with_statsoption for GET /projects/:id/repository/commits | Leonid Batizhevskii | 2018-06-12 | 2 | -9/+17 |
| | | |||||
* | | Change update entrypoint instead of adding new keep-alive one | Tomasz Maczukin | 2018-06-07 | 2 | -18/+9 |
| | | |||||
* | | Introduce new keep-alive API entrypoint for CI job | Tomasz Maczukin | 2018-06-07 | 1 | -0/+16 |
|/ | |||||
* | wording | Mark Chao | 2018-06-06 | 1 | -2/+2 |
| | |||||
* | Merge branch '45821-avatar_api' into 'master' | Rémy Coutable | 2018-06-06 | 3 | -0/+28 |
|\ | | | | | | | | | | | | | Add Avatar API Closes #45821 See merge request gitlab-org/gitlab-ce!19121 | ||||
| * | Add Avatar API | Imre | 2018-06-06 | 3 | -0/+28 |
| | | |||||
* | | Merge branch '25045-add-variables-to-post-pipeline-api' into 'master' | Grzegorz Bizon | 2018-06-06 | 1 | -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 api | Jacopo | 2018-06-05 | 1 | -1/+0 |
| | | | |||||
| * | | Review 1 | Jacopo | 2018-06-01 | 1 | -1/+5 |
| | | | |||||
| * | | Rename variables_attributes => variables and adds spec for exclude/only option | Jacopo | 2018-06-01 | 1 | -2/+2 |
| | | | |||||
| * | | Adds variables to POST api/v4/projects/:id/pipeline | Jacopo | 2018-06-01 | 2 | -0/+2 |
| | | | |||||
* | | | Merge branch 'sh-fix-events-nplus-one' into 'master' | Rémy Coutable | 2018-06-05 | 1 | -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 API | Stan Hu | 2018-06-05 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch '42751-rename-mr-maintainer-push' into 'master' | Robert Speicher | 2018-06-05 | 2 | -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-push | Mark Chao | 2018-06-01 | 2 | -2/+5 |
| |/ / | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751 | ||||
* | | | Merge branch 'sh-fix-pipeline-jobs-nplus-one' into 'master' | Rémy Coutable | 2018-06-05 | 1 | -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-one | Stan Hu | 2018-06-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | /api/projects/:id/pipelines/:pipeline_id/jobs | ||||
| * | | | Remove N+1 query for author in issues API | Stan Hu | 2018-06-04 | 1 | -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 Bizon | 2018-06-05 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Support presigned multipart uploads See merge request gitlab-org/gitlab-ce!18855 | ||||
| * | | | | Support presigned multipart uploads | Kamil Trzciński | 2018-06-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'sh-add-uncached-query-limiter' into 'master' | Rémy Coutable | 2018-06-05 | 1 | -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-limiter | Stan Hu | 2018-06-04 | 1 | -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 titles | Francisco Javier López | 2018-06-04 | 1 | -3/+1 |
| |/ / |/| | | |||||
* | | | Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-one | Stan Hu | 2018-06-03 | 1 | -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ński | 2018-06-01 | 2 | -11/+11 |
|\ \ | |/ |/| | | | | | | | | | 'master' Improve validations for Ci::Runner#runner_type See merge request gitlab-org/gitlab-ce!18901 | ||||
| * | Improve Runners API validations | Kamil Trzciński | 2018-05-31 | 1 | -1/+1 |
| | | |||||
| * | Improve runner registration API | Kamil Trzciński | 2018-05-31 | 1 | -7/+9 |
| | | |||||
| * | Improve `Ci::Runner#assign_to` to return a flag whether it succeeded or not | Kamil Trzciński | 2018-05-31 | 1 | -3/+1 |
| | | |||||
* | | Add merge requests list endpoint for groups | Felipe Artur | 2018-05-31 | 1 | -17/+32 |
| | | |||||
* | | Merge branch 'sh-fix-issue-api-perf-n-plus-one' into 'master' | Nick Thomas | 2018-05-31 | 1 | -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 API | Stan Hu | 2018-05-31 | 1 | -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 Maan | 2018-05-31 | 39 | -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-api | Francisco Javier López | 2018-05-30 | 39 | -5362/+5 |
| | | |||||
* | | Add missing usage_ping_enabled to API settings | Stan Hu | 2018-05-30 | 1 | -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 Speicher | 2018-05-30 | 2 | -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-preload | Douwe Maan | 2018-05-30 | 2 | -16/+20 |
| | | | | | | | | projects API | ||||
* | | Merge branch 'sh-use-grape-path-helpers' into 'master' | Sean McGivern | 2018-05-30 | 1 | -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-helpers | Stan Hu | 2018-05-30 | 1 | -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 Hughes | 2018-05-30 | 4 | -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-ce | blackst0ne | 2018-05-29 | 4 | -10/+13 |
| | | |||||
* | | Merge remote-tracking branch 'dev/master' | Mayra Cabrera | 2018-05-29 | 1 | -3/+3 |
|\ \ | |||||
| * \ | Merge branch 'security-dm-delete-deploy-key' into 'master' | Mayra Cabrera | 2018-05-29 | 1 | -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 entirely | Douwe Maan | 2018-05-04 | 1 | -3/+3 |
| | | | |