summaryrefslogtreecommitdiff
path: root/lib/api/merge_requests.rb
Commit message (Collapse)AuthorAgeFilesLines
* Fix remove_source_branch merge request API handlingsh-fix-merge-requests-api-remove-branch-paramStan Hu2019-04-151-1/+1
| | | | | | | | | Users attempting to set merge requests to `remove_source_branch` to `false` would encounter an Error 500 because the UpdateService and API checked `present?`, which would always return `false`. We now just use `has_key?` to decide whether the parameter is present. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60530
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-0/+4
| | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* Fix IDE detecting MR from fork branchPaul Slaughter2019-04-051-0/+1
| | | | | | | | | **Why?** Currently the IDE loads a merge request based on only the `source_branch` name. This means it loads MR's from forks that have the same branch name (not good). - This required updating the BE API to accept `source_project_id`
* Provide EE backports for filtering by approver featureIgor2019-03-071-0/+5
| | | | | Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
* Revert "Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'"Igor2019-03-071-5/+0
| | | | This reverts merge request !24982
* Merge branch 'sh-optimize-todos-api' into 'master'Sean McGivern2019-03-071-1/+1
|\ | | | | | | | | | | | | Significantly reduce N+1 queries in /api/v4/todos endpoint Closes #40378 See merge request gitlab-org/gitlab-ce!25711
| * Significantly reduce N+1 queries in /api/v4/todos endpointStan Hu2019-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | By preloading associations and batching issuable metadata lookups, we can significantly cut the number of SQL queries needed to load the Todos API endpoint. On GitLab.com, my own tests showed my user's SQL queries went from 365 to under 60 SQL queries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40378
* | Provide EE backports for filtering by approver featureIgor2019-03-071-0/+5
| | | | | | | | | | Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
* | Add array support for labelsAlexandru Croitor2019-03-061-2/+2
| | | | | | | | | | * Support label parameter as comma separated and array of strings for merge requests and issues api endpoints
* | PUT MergeRequest API endpoint - accept labels as an arrayMario de la Ossa2019-03-061-2/+2
|/
* Add API support for refreshing merge ref pathOswaldo Ferreira2019-02-261-0/+25
| | | | | | Add a merge_requests/:iid/merge_to_ref API which make use of the groundwork to write merge results into refs/merge-requests/:iid/merge.
* Respect the should_remove_source_branch parameter to the merge APINick Thomas2019-02-251-2/+2
|
* Added: Include order by ID desc for tie breakers in paginationNermin Vehabovic2019-02-161-1/+1
|
* API support for squash commit message during merge56014-api-merge-request-squash-commit-messagesLuke Duncalfe2019-02-071-0/+2
| | | | | | Issues https://gitlab.com/gitlab-org/gitlab-ce/issues/47149 https://gitlab.com/gitlab-org/gitlab-ce/issues/56014
* Merge branch 'search-title' into 'master'Sean McGivern2019-02-051-1/+2
|\ | | | | | | | | Add 'in' filter that modifies scope of 'search' filter to issues and merge requests API See merge request gitlab-org/gitlab-ce!24350
| * Fix grammar and spellingHiroyuki Sato2019-02-051-2/+2
| |
| * Add 'in' filter that modifies scope of 'search' filter to issues and merge ↵Hiroyuki Sato2019-01-141-1/+2
| | | | | | | | requests API
* | Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-221-1/+1
|/ | | | This is to match `git branch -D <branchname>`
* Merge branch 'if-52811-fix_namespaces_api_routing' into 'master'Nick Thomas2018-11-301-2/+2
|\ | | | | | | | | Fix API::Namespaces routing to accept namepaces with dots See merge request gitlab-org/gitlab-ce!22912
| * Fix API::Namespaces to accept namepaces with dotsif-52811-fix_namespaces_api_routingImre Farkas2018-11-281-2/+2
| | | | | | | | | | It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to API::NAMESPACE_OR_PROJECT_REQUIREMENTS
* | Allow the status of a rebase to be determinedNick Thomas2018-11-281-1/+8
| |
* | Add a rebase API endpoint for merge requestsNick Thomas2018-11-271-0/+26
|/
* Expose {closed,merged}_{at,by} in merge requests API indexDouwe Maan2018-11-051-1/+1
|
* Refactor api validator to separate classHeinrich Lee Yu2018-10-261-4/+1
|
* Apply similar change to MRs APIHeinrich Lee Yu2018-10-261-1/+5
|
* #13650 added wip search functionality and testsChantal Rollison2018-10-031-1/+1
|
* Enable frozen string in lib/api and lib/backupgfyoung2018-09-291-0/+2
| | | | | | | | | | Partially addresses #47424. Had to make changes to spec files because stubbing methods on frozen objects is a mess in RSpec and leads to failures: https://github.com/rspec/rspec-mocks/issues/1190
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-0/+2
| | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* Resolve "Return how many commits the source branch is behind the target ↵🙈 jacopo beschi 🙉2018-09-051-1/+2
| | | | branch through the API"
* Retrieve merge request closing issues from database cacheFelipe Artur2018-08-061-1/+1
|
* added API docsPhil Hughes2018-07-051-1/+1
| | | | | | CHANGELOG improved comments in API code improved spec description
* only include _html fields when asked forPhil Hughes2018-07-051-1/+2
|
* Add locked state to merge request APIChantal Rollison2018-06-281-2/+2
|
* Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-1/+2
|\ | | | | | | | | 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-011-1/+2
| | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751
* | 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.
* Add merge requests list endpoint for groupsFelipe Artur2018-05-311-17/+32
|
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-9/+4
|
* Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scopeMark Chao2018-05-211-4/+5
| | | | Deprecate corresponding dash versions created-by-me and assigned-to-me
* Correct permissions for creating merge requests from issuesBob Van Landuyt2018-04-111-1/+1
| | | | | | | This could only be possible for users that can create merge requests within a project. So they need to be a allowed to create a branch and create a merge request.
* Add documentation for allowing maintainers to pushBob Van Landuyt2018-03-071-1/+1
|
* Set `allow_maintainer_to_push` using the APIBob Van Landuyt2018-03-071-0/+1
|
* Unify lib/api/merge_requests.rb with EEprepend-grape-api-ceLin Jen-Shin2018-03-061-21/+40
|
* Merge branch '41616-api-issues-between-date' into 'master'Sean McGivern2018-03-051-0/+2
|\ | | | | | | | | | | | | Resolve "API support for selecting only updated issues before/after a given date" Closes #41616 See merge request gitlab-org/gitlab-ce!17417
| * Adds updated_at filter to issues and merge_requests APIJacopo2018-03-051-0/+2
| |
* | expose metrics in merge request apihaseeb2018-03-021-1/+1
|/
* Add source and target branch filters to merge requests APISean McGivern2018-03-011-0/+2
|
* Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-011-0/+6
| | | | | | | | | | | This ensures that we have more visibility in the number of SQL queries that are executed in web requests. The current threshold is hardcoded to 100 as we will rarely (maybe once or twice) change it. In production and development we use Sentry if enabled, in the test environment we raise an error. This feature is also only enabled in production/staging when running on GitLab.com as it's not very useful to other users.
* Merge branch '39214__pipeline_api' into 'master'Sean McGivern2018-01-111-0/+16
|\ | | | | | | | | | | | | Add `pipelines` endpoint to merge requests API Closes #39214 See merge request gitlab-org/gitlab-ce!15454
| * Fix styleTony Rom2018-01-101-2/+3
| |