Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Friend <nathan@gitlab.com>2019-06-25 18:27:05 +0300
committerNathan Friend <nathan@gitlab.com>2019-06-25 18:37:08 +0300
commitbf213dce74c10208312d7ef429905a4517b2b4a3 (patch)
tree3c3617ce59ce574724d35b126fdcff1c03a224f3 /app/views/projects/_merge_request_settings_description_text.html.haml
parent2b327c1b4ddde98719eca2b0e8edab8d9079f2f2 (diff)
Update project MR setting section description (CE)
This commit updates the merge requests description text in the project settings page.
Diffstat (limited to 'app/views/projects/_merge_request_settings_description_text.html.haml')
-rw-r--r--app/views/projects/_merge_request_settings_description_text.html.haml1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_settings_description_text.html.haml b/app/views/projects/_merge_request_settings_description_text.html.haml
new file mode 100644
index 00000000000..42964c900b3
--- /dev/null
+++ b/app/views/projects/_merge_request_settings_description_text.html.haml
@@ -0,0 +1 @@
+%p= s_('ProjectSettings|Choose your merge method, merge options, and merge checks.')