Merge branch 'ce-to-ee-2018-05-11' into 'master'

CE upstream - 2018-05-11 00:23 UTC

See merge request gitlab-org/gitlab-ee!5666

app/assets/stylesheets/framework/mixins.scss

@@ -17,6 +17,16 @@
  */
 @mixin markdown-table {
   width: auto;
+  display: inline-block;
+  overflow-x: auto;
+  border-left: 0;
+  border-right: 0;
+  border-bottom: 0;
+
+  @supports(width: fit-content) {
+    display: block;
+    width: fit-content;
+  }
 }
 
 /*

app/assets/stylesheets/pages/wiki.scss

@@ -180,11 +180,6 @@ ul.wiki-pages-list.content-list {
   }
 }
 
-.wiki-holder {
-  overflow-x: auto;
-  overflow-y: hidden;
-}
-
 .wiki {
   table {
     @include markdown-table;

app/views/projects/_wiki.html.haml

 - if @wiki_home.present?
   %div{ class: container_class }
-    .wiki-holder.prepend-top-default.append-bottom-default
+    .prepend-top-default.append-bottom-default
       .wiki
         = render_wiki_content(@wiki_home)
 - else

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

@@ -24,7 +24,7 @@
     - history_link = link_to s_("WikiHistoricalPage|history"), project_wiki_history_path(@project, @page)
     = (s_("WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}.") % { most_recent_link: most_recent_link, history_link: history_link }).html_safe
 
-.wiki-holder.prepend-top-default.append-bottom-default
+.prepend-top-default.append-bottom-default
   .wiki
     = render_wiki_content(@page)