Skip to content

G
gitlab-ce
Commit 8d9c7305 authored by Marin Jankovski's avatar Marin Jankovski
Browse files
Options

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

parents 193f9050 3ae9b696
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/views/projects/merge_requests/_new_submit.html.haml
View file @ 8d9c7305
...@@ -82,12 +82,12 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7