kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Browse source
This commit is contained in:
Marin Jankovski 2015-04-22 11:17:09 +02:00
commit 8d9c7305cd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/projects/merge_requests/_new_submit.html.haml
View file

@ -82,12 +82,12 @@
.mr-compare.merge-request .mr-compare.merge-request
%ul.nav.nav-tabs.merge-request-tabs %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 = link_to url_for(params) do
%i.fa.fa-history %i.fa.fa-history
Commits Commits
%span.badge= @commits.size %span.badge= @commits.size
%li.diffs-tab{data: {action: 'diffs'}} %li.diffs-tab{data: {action: 'diffs', toggle: 'tab'}}
= link_to url_for(params) do = link_to url_for(params) do
%i.fa.fa-list-alt %i.fa.fa-list-alt
Changes Changes