diff options
author | Victor Wu <victor@gitlab.com> | 2017-05-22 03:58:36 +0300 |
---|---|---|
committer | Victor Wu <victor@gitlab.com> | 2017-05-22 03:58:36 +0300 |
commit | dfead7a87d050b409e4b9f85160d4a126b054247 (patch) | |
tree | 5b6ca2d52ee762164da9ea00afa4d05b0beb3639 | |
parent | e15aee2b51e4f03972fba490e2974a761acccf6c (diff) |
Update mr_widget_merge_help.js
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js index 2fecebce7a0..86bc8d704e5 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.js @@ -7,17 +7,21 @@ export default { <section class="mr-widget-help"> <template v-if="missingBranch"> - If the {{missingBranch}} branch exists in your local repository, you + If the {{missingBranch}} branch exists in your local repository, + <a + data-toggle="modal" + href="#modal_merge_info"> + merge locally instead + </a> + . </template> <template v-else> - You + <a + data-toggle="modal" + href="#modal_merge_info"> + Merge locally instead + </a> </template> - can merge this merge request manually using the - <a - data-toggle="modal" - href="#modal_merge_info"> - command line. - </a> </section> `, }; |