Refactor to use template URL from backendnew-mr-repo-editor

5 files changed, 8 insertions, 9 deletions

diff --git a/app/assets/javascripts/repo/components/repo_commit_section.vue b/app/assets/javascripts/repo/components/repo_commit_section.vue
index da00de4c760..c0dc4c8cd8b 100644
--- a/app/assets/javascripts/repo/components/repo_commit_section.vue
+++ b/app/assets/javascripts/repo/components/repo_commit_section.vue
@@ -65,7 +65,7 @@ export default {
         .then(() => {
           this.resetCommitState();
           if (this.startNewMR) {
-            this.redirectToMrCreation(branch);
+            this.redirectToNewMr(branch);
           } else {
             this.redirectToBranch(branch);
           }
@@ -93,9 +93,8 @@ export default {
       }
     },
 
-    redirectToMrCreation(branch) {
-      const newMRURLComplete = `${this.newMRURL}?merge_request[source_branch]={{branch}}`;
-      visitUrl(newMRURLComplete.replace('{{branch}}', branch));
+    redirectToNewMr(branch) {
+      visitUrl(this.newMrTemplateUrl.replace('{{source_branch}}', branch));
     },
 
     redirectToBranch(branch) {
diff --git a/app/assets/javascripts/repo/index.js b/app/assets/javascripts/repo/index.js
index 49b255363f0..1a09f411b22 100644
--- a/app/assets/javascripts/repo/index.js
+++ b/app/assets/javascripts/repo/index.js
@@ -31,7 +31,7 @@ function setInitialStore(data) {
   Store.projectUrl = data.projectUrl;
   Store.canCommit = data.canCommit;
   Store.onTopOfBranch = data.onTopOfBranch;
-  Store.newMRURL = data.newMrUrl;
+  Store.newMrTemplateUrl = decodeURIComponent(data.newMrTemplateUrl);
   Store.customBranchURL = decodeURIComponent(data.blobUrl);
   Store.currentBranch = $('button.dropdown-menu-toggle').attr('data-ref');
   Store.checkIsCommitable();
diff --git a/app/assets/javascripts/repo/stores/repo_store.js b/app/assets/javascripts/repo/stores/repo_store.js
index 7c45a37b267..f8d29af7ffe 100644
--- a/app/assets/javascripts/repo/stores/repo_store.js
+++ b/app/assets/javascripts/repo/stores/repo_store.js
@@ -36,7 +36,7 @@ const RepoStore = {
   currentHash: '',
   currentShortHash: '',
   customBranchURL: '',
-  newMRURL: '',
+  newMrTemplateUrl: '',
   branchChanged: false,
   commitMessage: '',
   binaryTypes: {
diff --git a/app/views/shared/repo/_repo.html.haml b/app/views/shared/repo/_repo.html.haml
index 3294f8b290e..919f19f2c23 100644
--- a/app/views/shared/repo/_repo.html.haml
+++ b/app/views/shared/repo/_repo.html.haml
@@ -1,9 +1,9 @@
 #repo{ data: { url: content_url,
                project_name: project.name,
                refs_url: refs_project_path(project, format: :json),
-               new_mr_url: namespace_project_new_merge_request_path(project.namespace, project),
                project_url: project_path(project),
                project_id: project.id,
                blob_url: namespace_project_blob_path(project.namespace, project, '{{branch}}'),
+               new_mr_template_url: namespace_project_new_merge_request_path(project.namespace, project, merge_request: { source_branch: '{{source_branch}}' }),
                can_commit: (!!can_push_branch?(project, @ref)).to_s,
                on_top_of_branch: (!!on_top_of_branch?(project, @ref)).to_s } }
diff --git a/spec/javascripts/repo/components/repo_commit_section_spec.js b/spec/javascripts/repo/components/repo_commit_section_spec.js
index 63cfaebdc9a..0635de4b30b 100644
--- a/spec/javascripts/repo/components/repo_commit_section_spec.js
+++ b/spec/javascripts/repo/components/repo_commit_section_spec.js
@@ -115,7 +115,7 @@ describe('RepoCommitSection', () => {
       vm.commitMessage = commitMessage;
 
       spyOn(vm, 'tryCommit').and.callThrough();
-      spyOn(vm, 'redirectToMrCreation').and.stub();
+      spyOn(vm, 'redirectToNewMr').and.stub();
       spyOn(vm, 'redirectToBranch').and.stub();
       spyOn(RepoService, 'commitFiles').and.returnValue(Promise.resolve());
       spyOn(RepoService, 'getBranch').and.returnValue(Promise.resolve({
@@ -186,7 +186,7 @@ describe('RepoCommitSection', () => {
         // Wait for the branch check to finish
         .then(() => getSetTimeoutPromise())
         .then(() => {
-          expect(vm.redirectToMrCreation).toHaveBeenCalled();
+          expect(vm.redirectToNewMr).toHaveBeenCalled();
         })
         .then(done)
         .catch(done.fail);