summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/services
diff options
context:
space:
mode:
authorDenys Mishunov <dmishunov@gitlab.com>2019-03-01 17:33:18 +0100
committerDenys Mishunov <dmishunov@gitlab.com>2019-03-04 18:10:55 +0100
commita1b0b3e4ebb61e952b6e60e7be05bd96286bc298 (patch)
treed6dce2abed1ad4cccbcfe7a6ddce1fbaaf05cdce /app/assets/javascripts/ide/services
parent615c14b28990489d99371b7ffdb57fe54d463e64 (diff)
downloadgitlab-ce-a1b0b3e4ebb61e952b6e60e7be05bd96286bc298.tar.gz
Extended Web IDE API to get MRs for a certain branch in a project
New `Api.projectMergeRequests` allows: - to query for all MRs on a project without specifying `mergeRequestId` - to filter the returned MRs using parameters from https://bit.ly/2H7We4V The new API request is used for fetching information about MRs associated with a particular branch in Web IDE to have IdeSidebar behave consistently in both scenarios: - getting to a branch from and MR (where we already have info about relevant MR), or - getting to a branch somehow differently directly For cases where there are several merge requests that the current branch is associated with, mark the most recent one as 'current' Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49663
Diffstat (limited to 'app/assets/javascripts/ide/services')
-rw-r--r--app/assets/javascripts/ide/services/index.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/services/index.js b/app/assets/javascripts/ide/services/index.js
index 13449592e62..ba33b6826d6 100644
--- a/app/assets/javascripts/ide/services/index.js
+++ b/app/assets/javascripts/ide/services/index.js
@@ -40,6 +40,9 @@ export default {
getProjectData(namespace, project) {
return Api.project(`${namespace}/${project}`);
},
+ getProjectMergeRequests(projectId, params = {}) {
+ return Api.projectMergeRequests(projectId, params);
+ },
getProjectMergeRequestData(projectId, mergeRequestId, params = {}) {
return Api.projectMergeRequest(projectId, mergeRequestId, params);
},