diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-26 18:29:10 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-26 18:29:10 +0300 |
| commit | 5db323b24c70a8c96e6dec53a3992da44796dc10 (patch) | |
| tree | 22ed54b38b6133f1a202996f6e611f559201400e /app | |
| parent | f6474895fbcc13d21db166b255a9c0741402ce37 (diff) | |
| parent | ad7d7bedb466885440b260a458ed8176a4654404 (diff) | |
Merge branch 'security-2819-xss-resolve-conflicts-branch-name-11-7' into '11-7-stable'
Fix XSS in resolve conflicts form
See merge request gitlab/gitlabhq!2988
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" } |