diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-12 08:40:15 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-12 08:40:15 +0300 |
| commit | dd70776f67a7377deeaf369d59fd09e630f2f7ed (patch) | |
| tree | 7508ad39b90e328f7c1aea648db0d63e45cae108 /app/assets/javascripts/vue_merge_request_widget | |
| parent | 5d7d509840fc3941e5977ef02e948e7124925372 (diff) | |
MRWidget: Use targetBranchPath in everywhere.
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
3 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js index 4a1fd881169..fb648d66a30 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js @@ -83,7 +83,7 @@ export default { :title="isBranchTitleLong(mr.targetBranch) ? mr.targetBranch : ''" data-placement="bottom"> <a - :href="mr.targetBranchCommitsPath"> + :href="mr.targetBranchPath"> {{mr.targetBranch}} </a> </span> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js index 7e66441e5ff..fc2e42c6821 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js @@ -20,7 +20,7 @@ export default { <p> The changes were not merged into <a - :href="mr.targetBranchCommitsPath" + :href="mr.targetBranchPath" class="label-branch"> {{mr.targetBranch}}</a>. </p> diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index cc8446972db..faafeae5c5b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -43,7 +43,6 @@ export default class MergeRequestStore { this.mergeUserId = data.merge_user_id; this.currentUserId = gon.current_user_id; this.sourceBranchPath = data.source_branch_path; - this.targetBranchCommitsPath = data.target_branch_commits_path; this.sourceBranchLink = data.source_branch_with_namespace_link; this.mergeError = data.merge_error; this.targetBranchPath = data.target_branch_commits_path; |