summaryrefslogtreecommitdiff
path: root/spec/fixtures/api/schemas
Commit message (Collapse)AuthorAgeFilesLines
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-052-1/+6
| | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* Fixes spec failures due to not returning metrics for MRs other than ↵Oswaldo Ferreira2018-01-021-2/+4
| | | | closed/merged
* Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-023-2/+42
|
* Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-181-4/+4
|\ | | | | | | | | Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847
| * Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-151-4/+4
| | | | | | | | requests
* | Adds ordering to projects contributors in APIJacopo2017-12-132-0/+22
|/ | | | | | | Allows ordering in GET api/v4/projects/:project_id/repository/contributors through `order_by` and `sort` params. The available `order_by` options are: name|email|commits. The available `sort` options are: asc|desc.
* Add issue sidebar and toggle_subscription endpoint in board issues dataOswaldo Ferreira2017-11-201-0/+2
|
* Add administrative endpoint to list all pages domainsTravis Miller2017-11-134-20/+43
|
* Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-071-0/+1
|\
| * Add changes_count to the merge requests APIadd-changes-count-to-merge-requests-apiSean McGivern2017-11-031-0/+1
| | | | | | | | | | | | This returns the `real_size` of the MR's diff, which is a string indicating the number of changes. If the diff overflows after _n_ files, the string will be `$n+`.
* | Add ClusterApplicationEntity testsAlessio Caiazza2017-11-061-15/+11
| |
* | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-031-4/+2
|\ \ | |/
| * Remove private_token from API user entityDouwe Maan2017-11-021-4/+2
| |
* | Merge branch 'refactor-clusters' into 38464-k8s-appsKamil Trzcinski2017-11-027-27/+123
|\ \ | |/
| * Load participants asyncEric Eastwood2017-10-315-27/+95
| |
| * Add pages domains API schemaTravis Miller2017-10-221-0/+23
| |
| * Fix failed testKamil Trzcinski2017-10-171-2/+2
| |
| * Add short_revision and use total_sizeKamil Trzcinski2017-10-171-0/+5
| |
* | WIP: mock cluster apps status APIAlessio Caiazza2017-10-311-2/+33
|/
* Merge branch ↵Kamil Trzciński2017-10-061-0/+11
|\ | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470
| * Merge branch 'master' into ↵Shinya Maeda2017-10-061-0/+1
| |\ | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | Added cluster controller specsKamil Trzcinski2017-10-051-0/+11
| | |
* | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-062-0/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Jarka Kadlecova2017-10-032-2/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 18608-lock-issues-v2 # Conflicts: # db/schema.rb
| * \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-203-0/+9
| |\ \ \
| * | | | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-142-2/+2
| | | | |
| * | | | Support discussion lock in the APIJarka Kadlecova2017-09-142-0/+2
| | | | |
* | | | | Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-051-0/+1
| |_|_|/ |/| | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389
* | | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-044-0/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy load and paginate registry image list Closes #31050 See merge request gitlab-org/gitlab-ce!14303
| * | | | Add serializer matchersKamil Trzcinski2017-10-024-0/+67
| | |_|/ | |/| |
* | | | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce method calls while evaluating Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!14285
| * | | | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-1/+1
| |/ / /
* | | | Add merge_requests_rebase_enabled to json entities for specsValery Sizov2017-10-021-1/+2
| | | |
* | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-262-2/+25
|\ \ \ \ | |/ / /
| * | | Expose last pipeline details in API response when getting a single commitMehdi Lahmam2017-09-262-2/+25
| | |/ | |/| | | | | | | Closes #35692.
* | | Fix entities/merge_request.json by adding ff_only_mergeValery Sizov2017-09-201-1/+2
|/ /
* | Merge branch 'rc/improve-users-api-specs' into 'master'Grzegorz Bizon2017-09-192-0/+8
|\ \ | | | | | | | | | | | | Improve the Users API specs by asserting against the response schema See merge request gitlab-org/gitlab-ce!14334
| * | Improve the Users API specs by asserting against the response schemarc/improve-users-api-specsRémy Coutable2017-09-182-0/+8
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Add 'closed_at' attribute to Issues APIVitaliy @blackst0ne Klachkov2017-09-161-0/+1
|/
* Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-0/+1
| | | This reverts merge request !14148
* Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-081-1/+0
| | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* Merge branch ↵Sean McGivern2017-09-071-0/+1
|\ | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| * Restore some changes from !9199Rubén Dávila2017-09-061-0/+1
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-09-065-2/+28
|\ \ | |/ | | | | ee_issue_928_backport
| * Add spec (Halfway)Shinya Maeda2017-09-042-8/+9
| |
| * Extend API: Pipeline Schedule VariableShinya Maeda2017-09-041-0/+11
| |
| * Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-312-2/+14
| |\
| | * Add time stats to API schema for issue and merge request end pointsTravis Miller2017-08-292-2/+14
| | |
| * | Fix merge request json schema (add labels, milestone)Jarka Kadlecova2017-08-111-0/+2
| |/
* | Backport specsFelipe Artur2017-08-311-0/+5
| |
View Lorry Controller Status