Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 9 insertions, 0 deletions

diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index cd76a67b692..535964028f4 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -88,6 +88,15 @@
           = s_("Preferences|Show one file at a time on merge request's Changes tab")
         .form-text.text-muted
           = s_("Preferences|Instead of all the files changed, show only one file at a time. To switch between files, use the file browser.")
+      .form-group.form-check
+        = f.check_box :markdown_surround_selection, class: 'form-check-input'
+        = f.label :markdown_surround_selection, class: 'form-check-label' do
+          = s_('Preferences|Surround text selection when typing quotes or brackets')
+        .form-text.text-muted
+          - supported_characters = %w(" ' ` \( [ { < * _).map {|char| "<code>#{char}</code>" }.join(', ')
+          - msg = "Preferences|When you type in a description or comment box, selected text is surrounded by the corresponding character after typing one of the following characters: #{supported_characters}."
+          = s_(msg).html_safe
+
       .form-group
         = f.label :tab_width, s_('Preferences|Tab width'), class: 'label-bold'
         = f.number_field :tab_width,