diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-30 10:33:43 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-30 10:33:43 +0100 |
| commit | c760965079fce0f020980987794ea61c86eb09ff (patch) | |
| tree | 32bbac523c665a785eaaab85d9be305c02d8ce68 /app/views/projects/_merge_request_fast_forward_settings.html.haml | |
| parent | 323e402e21a643da22714bdede3cc6e248ba2cf4 (diff) | |
| parent | fd79df64c5411308e67a62b4c02a07f5317ddec1 (diff) | |
| download | gitlab-ce-c760965079fce0f020980987794ea61c86eb09ff.tar.gz | |
Merge branch 'master' into ide-list-merge-requests
Diffstat (limited to 'app/views/projects/_merge_request_fast_forward_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_fast_forward_settings.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_merge_request_fast_forward_settings.html.haml b/app/views/projects/_merge_request_fast_forward_settings.html.haml index f455522d17c..2f08a28e26e 100644 --- a/app/views/projects/_merge_request_fast_forward_settings.html.haml +++ b/app/views/projects/_merge_request_fast_forward_settings.html.haml @@ -1,7 +1,7 @@ - form = local_assigns.fetch(:form) - project = local_assigns.fetch(:project) -.radio +.form-check = label_tag :project_merge_method_ff do = form.radio_button :merge_method, :ff, class: "js-merge-method-radio qa-radio-button-merge-ff" %strong Fast-forward merge |