Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/framework/secondary_navigation_elements.scss

@@ -66,6 +66,7 @@
   }
 
   .nav-text {
+    flex: 1;
     padding-top: 16px;
     padding-bottom: 11px;
     display: inline-block;

app/assets/stylesheets/pages/wiki.scss

@@ -77,7 +77,6 @@
 
     .nav-controls {
       width: auto;
-      min-width: 50%;
     }
   }
 

app/views/projects/wikis/pages.html.haml

@@ -7,7 +7,7 @@
 %div{ class: container_class }
   .wiki-page-header
 
-    .nav-text
+    .nav-text.flex-fill
       %h2.wiki-page-title
         = s_("Wiki|Wiki Pages")
 

app/views/projects/wikis/show.html.haml

@@ -8,7 +8,7 @@
   %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
     = icon('angle-double-left')
 
-  .nav-text
+  .nav-text.flex-fill
     %h2.wiki-page-title= @page.human_title
     %span.wiki-last-edit-by
       - if @page.last_version