Moved the discussions count to be on the right of the tabs

app/assets/stylesheets/behaviors.scss

@@ -22,5 +22,5 @@
 }
 
 [v-cloak="true"] {
-  display: none;
+  display: none!important;
 }

app/views/projects/merge_requests/_show.html.haml

@@ -44,17 +44,6 @@
         = succeed '.' do
           = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
 
-    #resolve-count-app.line-resolve-all-container.prepend-top-10{ "v-cloak" => true }
-      %resolve-count{ "inline-template" => true, ":logged-out" => "#{current_user.nil?}"  }
-        .line-resolve-all{ "v-show" => "discussionCount > 0",
-          ":class" => "{ 'has-next-btn': !loggedOut && resolved !== discussionCount }" }
-          %span.line-resolve-btn.is-disabled{ type: "button",
-              ":class" => "{ 'is-active': resolved === discussionCount }" }
-            = icon("check")
-          %span.line-resolve-text
-            {{ resolved }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved
-        = render "discussions/jump_to_next"
-
     - if @commits_count.nonzero?
       %ul.merge-request-tabs.nav-links.no-top.no-bottom
         %li.notes-tab
@@ -74,6 +63,16 @@
           = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
             Changes
             %span.badge= @merge_request.diff_size
+        %li#resolve-count-app.line-resolve-all-container.pull-right.prepend-top-10.hidden-xs{ "v-cloak" => true }
+          %resolve-count{ "inline-template" => true, ":logged-out" => "#{current_user.nil?}"  }
+            .line-resolve-all{ "v-show" => "discussionCount > 0",
+              ":class" => "{ 'has-next-btn': !loggedOut && resolved !== discussionCount }" }
+              %span.line-resolve-btn.is-disabled{ type: "button",
+                  ":class" => "{ 'is-active': resolved === discussionCount }" }
+                = icon("check")
+              %span.line-resolve-text
+                {{ resolved }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved
+            = render "discussions/jump_to_next"
 
       .tab-content#diff-notes-app
         #notes.notes.tab-pane.voting_notes