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

8d9c7305 · Marin Jankovski · 193f9050 · 3ae9b696 · 8d9c7305
Commit 8d9c7305 authored Apr 22, 2015 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/views/projects/merge_requests/_new_submit.html.haml app/views/projects/merge_requests/_new_submit.html.haml +2 -2

No files found.
--- 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