Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
This commit is contained in:
commit
8d9c7305cd
1 changed files with 2 additions and 2 deletions
|
@ -82,12 +82,12 @@
|
|||
|
||||
.mr-compare.merge-request
|
||||
%ul.nav.nav-tabs.merge-request-tabs
|
||||
%li.commits-tab{data: {action: 'commits'}}
|
||||
%li.commits-tab{data: {action: 'commits', toggle: 'tab'}}
|
||||
= link_to url_for(params) do
|
||||
%i.fa.fa-history
|
||||
Commits
|
||||
%span.badge= @commits.size
|
||||
%li.diffs-tab{data: {action: 'diffs'}}
|
||||
%li.diffs-tab{data: {action: 'diffs', toggle: 'tab'}}
|
||||
= link_to url_for(params) do
|
||||
%i.fa.fa-list-alt
|
||||
Changes
|
||||
|
|
Loading…
Reference in a new issue