diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 12:09:20 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 12:09:20 +0100 |
| commit | 2f22890d4223c0b524ee1f27e222a24a8f0c9a87 (patch) | |
| tree | 79609a077a37cc49d95463b649ff4098cea10b4d /app/views/projects/compare/_form.html.haml | |
| parent | 907b754173ed4185574c38ded0a173360d073085 (diff) | |
| parent | fb7b0d6e710d462f5bef1df3195fa8b051668bfc (diff) | |
| download | gitlab-ce-2f22890d4223c0b524ee1f27e222a24a8f0c9a87.tar.gz | |
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion
Diffstat (limited to 'app/views/projects/compare/_form.html.haml')
| -rw-r--r-- | app/views/projects/compare/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index 08236216421..0f080b6acee 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -21,6 +21,6 @@ = button_tag "Compare", class: "btn btn-create commits-compare-btn" - if @merge_request.present? - = link_to "View Open Merge Request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'prepend-left-10 btn' + = link_to "View open merge request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'prepend-left-10 btn' - elsif create_mr_button? - = link_to "Create Merge Request", create_mr_path, class: 'prepend-left-10 btn' + = link_to "Create merge request", create_mr_path, class: 'prepend-left-10 btn' |