Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20

# Conflicts: # app/views/admin/application_settings/_help_page.html.haml [ci skip]

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20
# Conflicts: # app/views/admin/application_settings/_help_page.html.haml [ci skip]
d3612b5a · GitLab Bot · ce19ba6a · 38736175 · d3612b5a
Commit d3612b5a authored Jul 20, 2018 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

app/views/admin/application_settings/_help_page.html.haml app/views/admin/application_settings/_help_page.html.haml +3 -0

No files found.
--- a/app/views/admin/application_settings/_help_page.html.haml
+++ b/app/views/admin/application_settings/_help_page.html.haml
@@ -3,10 +3,13 @@

  %fieldset
    .form-group
+<<<<<<< HEAD
      = f.label :help_text, class: 'label-bold'
      = f.text_area :help_text, class: 'form-control', rows: 4
      .form-text.text-muted Markdown enabled
    .form-group
+=======
+>>>>>>> upstream/master
      = f.label :help_page_text, class: 'label-bold'
      = f.text_area :help_page_text, class: 'form-control', rows: 4
      .form-text.text-muted Markdown enabled