diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-29 14:13:35 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-29 14:13:35 -0500 |
| commit | 439e3f073591b41ef9926a4b8c33000ae1b068f7 (patch) | |
| tree | 9ae497ed8747b398de6232dec8c6626726f6a5eb /app/views/projects/_merge_request_settings.html.haml | |
| parent | dbfe8597419d409b10ce79daec7f5b39cfad492d (diff) | |
| download | gitlab-ce-439e3f073591b41ef9926a4b8c33000ae1b068f7.tar.gz | |
Port semi-linear merge strategy to CE (mostly FE)
Diffstat (limited to 'app/views/projects/_merge_request_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_settings.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml index 939750ed1e5..fd0c419cdac 100644 --- a/app/views/projects/_merge_request_settings.html.haml +++ b/app/views/projects/_merge_request_settings.html.haml @@ -11,6 +11,8 @@ %span.descr A merge commit is created for every merge, and merging is allowed as long as there are no conflicts. + = render 'merge_request_rebase_settings', form: form + = render 'merge_request_fast_forward_settings', project: @project, form: form = render 'projects/merge_request_merge_settings', form: form |