diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-24 00:06:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-24 00:06:17 +0300 |
| commit | 11faf8ae72dcdbaff31f97410a3a9319324438fd (patch) | |
| tree | 2dc680f52ef8b2355c9097dfd1bbeb5ba899df3c /app/views | |
| parent | 7f0a4a64d0bc59b184ae3ee578adb6ebd3c48bf7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_merge_request_merge_options_settings.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_merge_options_settings.html.haml b/app/views/projects/_merge_request_merge_options_settings.html.haml index 5ab475822de..047b4dafbfc 100644 --- a/app/views/projects/_merge_request_merge_options_settings.html.haml +++ b/app/views/projects/_merge_request_merge_options_settings.html.haml @@ -12,3 +12,9 @@ = form.check_box :printing_merge_request_link_enabled, class: 'form-check-input' = form.label :printing_merge_request_link_enabled, class: 'form-check-label' do = s_('ProjectSettings|Show link to create/view merge request when pushing from the command line') + .form-check.mb-2 + = form.check_box :remove_source_branch_after_merge, class: 'form-check-input' + = form.label :remove_source_branch_after_merge, class: 'form-check-label' do + = s_("ProjectSettings|Enable 'Delete source branch' option by default") + .descr.text-secondary + = s_('ProjectSettings|Existing merge requests and protected branches are not affected') |