diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-26 18:45:34 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-26 18:45:34 +0300 |
| commit | 633587b744eb247a0b96f4949b48dd4324d5db23 (patch) | |
| tree | 1d51b753f9ebf7ac21d7adaa6c40b88bd9651fc4 /app | |
| parent | 7caadb5512adff91939ebd25480dd65a6d4de785 (diff) | |
| parent | 5f338ce9ebacfbf13daf435a845ce0b3da9c7e06 (diff) | |
Merge branch 'security-2819-xss-resolve-conflicts-branch-name-11-9' into '11-9-stable'
Fix XSS in resolve conflicts form
See merge request gitlab/gitlabhq!3030
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" } |