summaryrefslogtreecommitdiff
path: root/app/views/projects/_merge_request_settings.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/_merge_request_settings.html.haml')
-rw-r--r--app/views/projects/_merge_request_settings.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml
index c5a25bec6eb..728ff597860 100644
--- a/app/views/projects/_merge_request_settings.html.haml
+++ b/app/views/projects/_merge_request_settings.html.haml
@@ -12,5 +12,7 @@
= render 'projects/merge_request_merge_commit_template', project: @project, form: form
+= render 'projects/merge_request_squash_commit_template', project: @project, form: form
+
- if @project.forked?
= render 'projects/merge_request_target_project_settings', project: @project, form: form