diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-05-29 17:24:50 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-05-29 17:24:50 +0200 |
commit | a2f6aa96a9f44a0c1880871c2d5a7b8638d8b3cb (patch) | |
tree | 5c7d8a8befe6a362081f7e3f1cd468874f5bd792 /app/views/projects/_merge_request_merge_settings.html.haml | |
parent | 162cc55e49e155d64ee862dfebefd97cec7d272c (diff) | |
parent | 58c50d40524e0b0c23d4c5d7782583e3742047ba (diff) | |
download | gitlab-ce-a2f6aa96a9f44a0c1880871c2d5a7b8638d8b3cb.tar.gz |
Merge branch 'master' into backstage/gb/use-persisted-stages-to-improve-pipelines-table
* master: (583 commits)
Diffstat (limited to 'app/views/projects/_merge_request_merge_settings.html.haml')
-rw-r--r-- | app/views/projects/_merge_request_merge_settings.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/_merge_request_merge_settings.html.haml b/app/views/projects/_merge_request_merge_settings.html.haml index f6e5712ce81..762a263656d 100644 --- a/app/views/projects/_merge_request_merge_settings.html.haml +++ b/app/views/projects/_merge_request_merge_settings.html.haml @@ -1,7 +1,7 @@ - form = local_assigns.fetch(:form) .form-group - .checkbox.builds-feature{ class: ("hidden" if @project && @project.project_feature.send(:builds_access_level) == 0) } + .form-check.builds-feature{ class: ("hidden" if @project && @project.project_feature.send(:builds_access_level) == 0) } = form.label :only_allow_merge_if_pipeline_succeeds do = form.check_box :only_allow_merge_if_pipeline_succeeds %strong Only allow merge requests to be merged if the pipeline succeeds @@ -9,15 +9,15 @@ %span.descr Pipelines need to be configured to enable this feature. = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds'), target: '_blank' - .checkbox + .form-check = 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-check = form.label :resolve_outdated_diff_discussions do = form.check_box :resolve_outdated_diff_discussions %strong Automatically resolve merge request diff discussions when they become outdated - .checkbox + .form-check = 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 |