diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-08 15:38:17 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-08 15:38:17 +0300 |
| commit | 05e63fe09c8a44ed14d4282db81d18927ce1a5ad (patch) | |
| tree | 961f0f19950c45575453d097e7151d94b7387253 /app/views/projects/merge_requests/new.html.haml | |
| parent | 23de3551ab1ece5a3782c07d3a88a092122431d0 (diff) | |
| download | gitlab-ce-05e63fe09c8a44ed14d4282db81d18927ce1a5ad.tar.gz | |
MergeRequest#new 2 step process
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests/new.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/new.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/new.html.haml b/app/views/projects/merge_requests/new.html.haml index 8ee0e1a8d46..c24e5916721 100644 --- a/app/views/projects/merge_requests/new.html.haml +++ b/app/views/projects/merge_requests/new.html.haml @@ -1,3 +1,4 @@ -%h3.page-title New Merge Request -%hr -= render 'form' +- if @commits.present? + = render 'new_submit' +- else + = render 'new_compare' |