diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-02 07:48:33 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-02 07:48:33 +0000 |
| commit | 6557858faeb5ae56d18a2f4463d43e0bc22d700f (patch) | |
| tree | 4ff157007e9e546bf4ec3a5bb8090f93a3f68b67 /app | |
| parent | 3e4c2b0427d70e920758e9c8f71ac43060d8c509 (diff) | |
| parent | e6e9c10ee1be86301db02cbf7d0e833b2ef6e073 (diff) | |
| download | gitlab-ce-6557858faeb5ae56d18a2f4463d43e0bc22d700f.tar.gz | |
Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'
Fix XSS in resolve conflicts form
See merge request gitlab/gitlabhq!2977
Diffstat (limited to 'app')
| -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" } |