Merge branch '20495-plus-icon-button' into 'master'

Remove plus icon from compare view

Closes #20495

See merge request !9056
This commit is contained in:
Alfredo Sumaran 2017-02-08 16:29:20 +00:00
commit e1ba28a98f
3 changed files with 6 additions and 6 deletions

View File

@ -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

View File

@ -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'

View File

@ -0,0 +1,4 @@
---
title: Remove plus icon from MR button on compare view
merge_request:
author: