Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/framework/markdown_area.scss

@@ -154,7 +154,7 @@
   }
 
 
-  table:not(.js-syntax-highlight) {
+  table {
     @include markdown-table;
   }
 }

app/assets/stylesheets/framework/mixins.scss

@@ -29,15 +29,14 @@
   display: block;
   overflow-x: auto;
   border: 0;
-  border-color: $gl-gray-100;
 
   tr {
     th {
-      border-bottom: solid 2px $gl-gray-100;
+      border-bottom: solid 2px $gl-gray-200;
     }
 
     td {
-      border-color: $gl-gray-100;
+      border-color: $gl-gray-200;
     }
   }
 }

app/assets/stylesheets/framework/typography.scss

@@ -136,15 +136,21 @@
     margin: 0 0 16px;
   }
 
-  table:not(.js-syntax-highlight) {
+  table {
     @extend .table;
     @extend .table-bordered;
     margin: 16px 0;
     color: $gl-text-color;
     border: 0;
 
-    th {
-      background: $label-gray-bg;
+    tr {
+      th {
+        border-bottom: solid 2px $gl-gray-200;
+      }
+
+      td {
+        border-color: $gl-gray-200;
+      }
     }
   }
 

app/assets/stylesheets/pages/notes.scss

@@ -224,14 +224,9 @@ $note-form-margin-left: 72px;
       overflow-y: hidden;
 
       .note-text {
-        @include md-typography;
         // Reset ul style types since we're nested inside a ul already
         @include bulleted-list;
         word-wrap: break-word;
-
-        table {
-          @include markdown-table;
-        }
       }
     }
 

app/views/clusters/clusters/gcp/_form.html.haml

@@ -17,9 +17,11 @@
   .form-group
     = field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-bold'
     = field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name')
-  .form-group
-    = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-bold'
-    = field.text_field :environment_scope, class: 'form-control', readonly: !has_multiple_clusters?, placeholder: s_('ClusterIntegration|Environment scope')
+  - if has_multiple_clusters?
+    .form-group
+      = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-bold'
+      = field.text_field :environment_scope, class: 'form-control', placeholder: s_('ClusterIntegration|Environment scope')
+      .form-text.text-muted= s_("ClusterIntegration|Choose which of your environments will use this cluster.")
 
   = field.fields_for :provider_gcp, @gcp_cluster.provider_gcp do |provider_gcp_field|
     .form-group

app/views/clusters/clusters/user/_form.html.haml

@@ -7,6 +7,7 @@
     .form-group
       = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-bold'
       = field.text_field :environment_scope, class: 'form-control', placeholder: s_('ClusterIntegration|Environment scope')
+      .form-text.text-muted= s_("ClusterIntegration|Choose which of your environments will use this cluster.")
 
   = field.fields_for :platform_kubernetes, @user_cluster.platform_kubernetes do |platform_kubernetes_field|
     .form-group

changelogs/unreleased/57655-fix-markdown-tables-border.yml

+---
+title: Fix markdown table header and table content borders
+merge_request: 25666
+author:
+type: fixed