diff options
Diffstat (limited to 'app/assets/javascripts/repo')
-rw-r--r-- | app/assets/javascripts/repo/components/repo_commit_section.vue | 7 | ||||
-rw-r--r-- | app/assets/javascripts/repo/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/repo/stores/repo_store.js | 2 |
3 files changed, 5 insertions, 6 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: { |