diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-07 14:48:53 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-07 14:48:53 +0100 |
| commit | d611a3879816d07f5842e2bdcea69b0813777107 (patch) | |
| tree | 5f0df5c5d68731198b74b2df3d27070ef632d79c /app/views/projects/merge_requests/new.html.haml | |
| parent | 0dcff1342b38c093a05c9edd13d422ee0b37b7bd (diff) | |
| parent | e88fd58671f5407d80fafe1070d48b750b9f2e50 (diff) | |
| download | gitlab-ce-d611a3879816d07f5842e2bdcea69b0813777107.tar.gz | |
Merge branch 'master' into reference-pipeline-and-caching
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' |