diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:46 +0000 |
| commit | ee7de3a24d62376916d78649d7e477a184b2e203 (patch) | |
| tree | b782b1d7e7762cdcc1a54073a4115fdb3ad7a22c /app/assets/javascripts | |
| parent | e4ea43b2b85ad5f3115f00220601eb719705139a (diff) | |
| download | gitlab-ce-ee7de3a24d62376916d78649d7e477a184b2e203.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index a18da7386f6..9085383e230 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -121,8 +121,14 @@ export default { ); }, mergeError() { + let { mergeError } = this.mr; + + if (mergeError && mergeError.slice(-1) === '.') { + mergeError = mergeError.slice(0, -1); + } + return sprintf(s__('mrWidget|Merge failed: %{mergeError}. Please try again.'), { - mergeError: this.mr.mergeError, + mergeError, }); }, }, |