diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-08 16:29:20 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-08 16:29:20 +0000 |
| commit | e1ba28a98f110bd33e43c9c6ae7d502284201ff9 (patch) | |
| tree | 98ebfe22f68036de83bb1000c774aeaf37702500 | |
| parent | 11d33873a8da5f90fd00bf0909dd1e9f8fca1448 (diff) | |
| parent | af420c3e805ee89c76dff2e0a4aeb17a726f0fe9 (diff) | |
| download | gitlab-ce-e1ba28a98f110bd33e43c9c6ae7d502284201ff9.tar.gz | |
Merge branch '20495-plus-icon-button' into 'master'
Remove plus icon from compare view
Closes #20495
See merge request !9056
| -rw-r--r-- | app/views/projects/commits/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/compare/_form.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/20495-plus-icon-button.yml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index d94f23f5a38..08cb8a04413 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -22,9 +22,7 @@ = link_to "View Open Merge Request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn' - elsif create_mr_button?(@repository.root_ref, @ref) .control - = link_to create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' do - = icon('plus') - Create Merge Request + = link_to "Create Merge Request", create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' .control = form_tag(namespace_project_commits_path(@project.namespace, @project, @id), method: :get, class: 'commits-search-form') do diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index d76d48187cd..08236216421 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -23,6 +23,4 @@ - 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' - elsif create_mr_button? - = link_to create_mr_path, class: 'prepend-left-10 btn' do - = icon("plus") - Create Merge Request + = link_to "Create Merge Request", create_mr_path, class: 'prepend-left-10 btn' diff --git a/changelogs/unreleased/20495-plus-icon-button.yml b/changelogs/unreleased/20495-plus-icon-button.yml new file mode 100644 index 00000000000..0f8650eb7b6 --- /dev/null +++ b/changelogs/unreleased/20495-plus-icon-button.yml @@ -0,0 +1,4 @@ +--- +title: Remove plus icon from MR button on compare view +merge_request: +author: |