diff options
| author | John Jarvis <jarv@gitlab.com> | 2019-04-02 10:12:32 +0200 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-04-02 10:12:32 +0200 |
| commit | 69b65a6b745e74bba290787420a0017395fd7c25 (patch) | |
| tree | c328963cbe5b340c58c88230d21f338c77462ebd /app/views/projects/merge_requests/conflicts | |
| parent | 1b6fe3ae226e4c6f481c90c886e242fcd96ab11b (diff) | |
| parent | 3e81a5baf25d6ecd9ad807a2b8f4238dcc598d5e (diff) | |
| download | gitlab-ce-69b65a6b745e74bba290787420a0017395fd7c25.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitlab-2019-04-02jarv/dev-to-gitlab-2019-04-02
Diffstat (limited to 'app/views/projects/merge_requests/conflicts')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_submit_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml index 8181267184a..55c89f137c5 100644 --- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml +++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml @@ -6,7 +6,7 @@ .form-group.row .col-md-4 %h4= _('Resolve conflicts on source branch') - .resolve-info + .resolve-info{ "v-pre": true } = translation.html_safe .col-md-8 %label.label-bold{ "for" => "commit-message" } |