diff options
| author | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2017-03-17 17:04:51 +0000 |
|---|---|---|
| committer | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2017-03-17 17:04:51 +0000 |
| commit | b6bab6ce47813c67ea1e2c7d4fde7d9e320da99c (patch) | |
| tree | 6c1b7db2aeebc5756c73842cffef22df655cc820 /app/views/projects/_merge_request_merge_settings.html.haml | |
| parent | 116efdaf128ddcccc30fb82615cd964b35cacc53 (diff) | |
| parent | bb1620aaf712c22c61fda098260f481ad79a05e2 (diff) | |
| download | gitlab-ce-focus-mode-board.tar.gz | |
Merge branch 'master' into 'focus-mode-board'focus-mode-board
# Conflicts:
# app/views/shared/issuable/_filter.html.haml
Diffstat (limited to 'app/views/projects/_merge_request_merge_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_merge_settings.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_merge_settings.html.haml b/app/views/projects/_merge_request_merge_settings.html.haml index 188198c47d5..61420fd0fb6 100644 --- a/app/views/projects/_merge_request_merge_settings.html.haml +++ b/app/views/projects/_merge_request_merge_settings.html.haml @@ -13,3 +13,7 @@ = form.label :only_allow_merge_if_all_discussions_are_resolved do = form.check_box :only_allow_merge_if_all_discussions_are_resolved %strong Only allow merge requests to be merged if all discussions are resolved + .checkbox + = form.label :printing_merge_request_link_enabled do + = form.check_box :printing_merge_request_link_enabled + %strong Show link to create/view merge request when pushing from the command line |