diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-06-21 15:24:19 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-06-23 19:16:19 +0300 |
| commit | 275d7b38691bfa7e50adbfdf20e644fea4f176a8 (patch) | |
| tree | f0b28e74e430be0ac7652e7f345c5f0514a6090a /app/views | |
| parent | 051fbfb8185509784a99d7ccc12b83e5fabffb67 (diff) | |
Introduce namespace license checks for rebase before merge
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/ee/_merge_request_settings.html.haml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/app/views/projects/ee/_merge_request_settings.html.haml b/app/views/projects/ee/_merge_request_settings.html.haml index 8d46ed20495..1bf75a60f04 100644 --- a/app/views/projects/ee/_merge_request_settings.html.haml +++ b/app/views/projects/ee/_merge_request_settings.html.haml @@ -20,9 +20,10 @@ %span.descr A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible. This way you could make sure that if this merge request would build, after merging to target branch it would also build. - %br - %span.descr - When fast-forward merge is not possible, the user is given the option to rebase. + - if project.feature_available?(:merge_request_rebase) + %br + %span.descr + When fast-forward merge is not possible, the user is given the option to rebase. .radio = label_tag :project_merge_method_ff do @@ -31,9 +32,10 @@ %br %span.descr No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded. - %br - %span.descr - When fast-forward merge is not possible, the user is given the option to rebase. + - if project.feature_available?(:merge_request_rebase) + %br + %span.descr + When fast-forward merge is not possible, the user is given the option to rebase. .form-group = form.label :merge_requests_template, class: 'label-light' do |