diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-12-08 12:35:54 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-12-08 12:35:54 +0100 |
| commit | 6d2be0212c444c6a3d25ae6a3c75822fa1c8614f (patch) | |
| tree | 66c12a4f7863ded395300a56de689b5cb669e84b /app/views/projects/merge_requests/new.html.haml | |
| parent | ad37f58ebd97fee3c06a531e4067c8adb4c9ecc7 (diff) | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| download | gitlab-ce-6d2be0212c444c6a3d25ae6a3c75822fa1c8614f.tar.gz | |
Merge branch 'master' into sync-all-repos
Diffstat (limited to 'app/views/projects/merge_requests/new.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/new.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/new.html.haml b/app/views/projects/merge_requests/new.html.haml index 9fdde80c6d9..d259968030e 100644 --- a/app/views/projects/merge_requests/new.html.haml +++ b/app/views/projects/merge_requests/new.html.haml @@ -1,7 +1,7 @@ - page_title "New Merge Request" = render "header_title" -- if @merge_request.can_be_created +- if @merge_request.can_be_created && !params[:change_branches] = render 'new_submit' - else = render 'new_compare' |