summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-04-22 11:17:09 +0200
committerMarin Jankovski <maxlazio@gmail.com>2015-04-22 11:17:09 +0200
commit8d9c7305cde484f216ca9926b48b29a63b463275 (patch)
tree885a97f1f5f59b83912ee00686da7c44544f8235
parent193f905072e81615dbbea2357874878d697fefb6 (diff)
parent3ae9b696f60876b398bc150c3ca5e3f0fe0323d0 (diff)
downloadgitlab-ce-8d9c7305cde484f216ca9926b48b29a63b463275.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
-rw-r--r--app/views/projects/merge_requests/_new_submit.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index d986ce67c0c..4e72458932c 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -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