diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-10 12:22:56 -0700 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-05-10 12:22:56 -0700 |
commit | bed783ac15453f60651f861803bba93c622625ba (patch) | |
tree | d560107fff213edcc6abb51f215a029b1e5fd740 /app/views/projects/branches/_branch.html.haml | |
parent | e42f7e2a5a733d7c3682bd7d15e509e1943003bc (diff) | |
download | gitlab-ce-bed783ac15453f60651f861803bba93c622625ba.tar.gz |
Rename btn-secondary to btn-default
Diffstat (limited to 'app/views/projects/branches/_branch.html.haml')
-rw-r--r-- | app/views/projects/branches/_branch.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index fc96fd9cf3a..5b1f2d8953b 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -41,12 +41,12 @@ .controls.d-none.d-sm-block< - if merge_project && create_mr_button?(@repository.root_ref, branch.name) - = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-secondary' do + = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do = _('Merge request') - if branch.name != @repository.root_ref = link_to project_compare_index_path(@project, from: @repository.root_ref, to: branch.name), - class: "btn btn-secondary #{'prepend-left-10' unless merge_project}", + class: "btn btn-default #{'prepend-left-10' unless merge_project}", method: :post, title: s_('Branches|Compare') do = s_('Branches|Compare') |