Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

9 files changed, 34 insertions, 168 deletions

diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index e0e10d63f8e..52bd16d1a79 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -181,6 +181,7 @@
   .license-selector,
   .gitignore-selector,
   .gitlab-ci-yml-selector,
+  .gitlab-ci-syntax-yml-selector,
   .dockerfile-selector,
   .template-type-selector,
   .metrics-dashboard-selector {
diff --git a/app/assets/stylesheets/pages/incident_management_list.scss b/app/assets/stylesheets/pages/incident_management_list.scss
deleted file mode 100644
index ba363e2d119..00000000000
--- a/app/assets/stylesheets/pages/incident_management_list.scss
+++ /dev/null
@@ -1,150 +0,0 @@
-.incident-management-list {
-  .new-alert {
-    background-color: $issues-today-bg;
-  }
-
-  // these styles need to be deleted once GlTable component looks in GitLab same as in @gitlab/ui
-  table {
-    @include gl-text-gray-500;
-
-    tbody {
-      tr:not(.b-table-busy-slot):not(.b-table-empty-row) {
-        &:hover {
-          @include gl-border-t-double;
-
-          td {
-            @include gl-border-b-initial;
-          }
-        }
-      }
-    }
-
-    tr {
-      &:focus {
-        @include gl-outline-none;
-      }
-
-      td,
-      th {
-        @include gl-py-5;
-        @include gl-outline-none;
-        @include gl-relative;
-      }
-
-      th {
-        @include gl-bg-transparent;
-        @include gl-font-weight-bold;
-        @include gl-text-gray-400;
-
-        &[aria-sort='none']:hover {
-          background-image: url('data:image/svg+xml, %3csvg   xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="4 0 8 16"%3e   %3cpath style="fill: %23BABABA;" fill-rule="evenodd" d="M11.707085,11.7071   L7.999975,15.4142 L4.292875,11.7071 C3.902375,11.3166 3.902375,   10.6834 4.292875,10.2929 C4.683375,9.90237   5.316575,9.90237 5.707075,10.2929 L6.999975,   11.5858 L6.999975,2 C6.999975,1.44771   7.447695,1 7.999975,1 C8.552255,1 8.999975,1.44771   8.999975,2 L8.999975,11.5858 L10.292865,10.2929 C10.683395   ,9.90237 11.316555,9.90237 11.707085,10.2929   C12.097605,10.6834 12.097605,11.3166 11.707085,11.7071 Z"/%3e   %3c/svg%3e');
-        }
-      }
-    }
-
-    @include media-breakpoint-up(md) {
-      tr {
-        &:last-child {
-          td {
-            @include gl-border-0;
-          }
-        }
-      }
-
-      .sortable-cell {
-        padding-left: calc(0.75rem + 0.65em);
-      }
-    }
-  }
-
-  @include media-breakpoint-down(sm) {
-    table {
-      tr {
-        @include gl-border-t-0;
-
-        .table-col {
-          min-height: 68px;
-        }
-
-        &:hover {
-          @include gl-bg-white;
-          @include gl-border-none;
-        }
-
-        th,
-        td {
-          @include gl-pt-6;
-        }
-      }
-
-      &.alert-management-table {
-        .table-col {
-          &:last-child {
-            @include gl-bg-gray-10;
-
-            &::before {
-              content: none !important;
-            }
-
-            div:not(.dropdown-title) {
-              width: 100% !important;
-              padding: 0 !important;
-            }
-          }
-        }
-      }
-
-      .b-table-empty-row {
-        td {
-          @include gl-border-b-0;
-
-          div {
-            text-align: unset !important;
-          }
-        }
-      }
-
-      .b-table-busy-slot {
-        td {
-          @include gl-border-b-0;
-
-          div {
-            text-align: center !important;
-          }
-        }
-      }
-    }
-  }
-
-  .gl-tabs-nav {
-    @include gl-border-b-0;
-
-    .gl-tab-nav-item {
-      @include gl-text-gray-500;
-
-      > .gl-tab-counter-badge {
-        @include gl-reset-color;
-        @include gl-font-sm;
-        @include gl-bg-gray-50;
-      }
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    .list-header {
-      @include gl-flex-direction-column-reverse;
-    }
-
-    .create-incident-button {
-      @include gl-w-full;
-    }
-  }
-
-  .integration-list {
-    .b-table-empty-row {
-      td {
-        @include gl-px-0;
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index efca82def92..b99e619cc98 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -124,7 +124,7 @@ $mr-widget-min-height: 69px;
       padding: $gl-padding;
 
       @include media-breakpoint-up(md) {
-        padding-left: $gl-padding-8 * 7;
+        margin-left: $gl-spacing-scale-7;
       }
     }
   }
@@ -301,7 +301,8 @@ $mr-widget-min-height: 69px;
       margin: 0 0 0 10px;
     }
 
-    .bold {
+    .bold,
+    .gl-font-weight-bold {
       font-weight: $gl-font-weight-bold;
       color: $gray-600;
       margin-left: 10px;
@@ -317,7 +318,8 @@ $mr-widget-min-height: 69px;
     }
 
     .spacing,
-    .bold {
+    .bold,
+    .gl-font-weight-bold {
       vertical-align: middle;
     }
 
@@ -394,10 +396,6 @@ $mr-widget-min-height: 69px;
     }
   }
 
-  .mr-widget-help {
-    padding: 10px 16px 10px ($gl-padding-8 * 7);
-  }
-
   .ci-coverage {
     float: right;
   }
@@ -1016,3 +1014,11 @@ $mr-widget-min-height: 69px;
     vertical-align: middle;
   }
 }
+
+.mr-ready-to-merge-loader {
+  max-width: 418px;
+
+  > svg {
+    vertical-align: middle;
+  }
+}
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 0c24ea9ccc6..254ad96bb57 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -100,8 +100,6 @@
   color: $orange-600;
   background-color: $orange-50;
   border-radius: $border-radius-default $border-radius-default 0 0;
-  border: 1px solid $border-gray-normal;
-  border-bottom: 0;
   padding: 3px 12px;
   margin: auto;
   align-items: center;
@@ -454,3 +452,9 @@ table {
 .markdown-selector {
   color: $blue-600;
 }
+
+.comment-warning-wrapper {
+  .md-area {
+    border: 0;
+  }
+}
diff --git a/app/assets/stylesheets/pages/registry.scss b/app/assets/stylesheets/pages/registry.scss
new file mode 100644
index 00000000000..31c6dbd2970
--- /dev/null
+++ b/app/assets/stylesheets/pages/registry.scss
@@ -0,0 +1,8 @@
+// Workaround for gl-breadcrumb at the last child of the handwritten breadcrumb
+// until this gitlab-ui issue is resolved: https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1079
+//
+// See app/assets/javascripts/registry/explorer/components/registry_breadcrumb.vue when this is changed.
+.breadcrumbs-container .gl-breadcrumbs {
+  padding: 0;
+  box-shadow: none;
+}
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 335e177d169..f31b6d96f03 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -43,7 +43,7 @@
 
 .settings-header {
   position: relative;
-  padding: 20px 110px 0 0;
+  padding: 24px 110px 0 0;
 
   h4 {
     margin-top: 0;
diff --git a/app/assets/stylesheets/pages/settings_ci_cd.scss b/app/assets/stylesheets/pages/settings_ci_cd.scss
index ebf21f58208..346b3f61caa 100644
--- a/app/assets/stylesheets/pages/settings_ci_cd.scss
+++ b/app/assets/stylesheets/pages/settings_ci_cd.scss
@@ -17,10 +17,6 @@
   }
 }
 
-.registry-placeholder {
-  min-height: 60px;
-}
-
 .auto-devops-card {
   margin-bottom: $gl-vert-padding;
 }
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 8f3574a337b..352050f7b01 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -98,6 +98,7 @@
 
   .tree-table {
     margin-bottom: 0;
+    table-layout: fixed;
 
     tr {
       border-bottom: 1px solid $white-normal;
diff --git a/app/assets/stylesheets/pages/trials.scss b/app/assets/stylesheets/pages/trials.scss
index 3fb9054b2b8..55f323b7df7 100644
--- a/app/assets/stylesheets/pages/trials.scss
+++ b/app/assets/stylesheets/pages/trials.scss
@@ -3,13 +3,13 @@
 * MR link https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22716
 */
 .gl-select2-html5-required-fix div.select2-container+select.select2 {
+  @include gl-opacity-0;
+  @include gl-border-0;
+  @include gl-bg-none;
+  @include gl-bg-transparent;
   display: block !important;
   width: 1px;
   height: 1px;
   z-index: -1;
-  opacity: 0;
   margin: -3px auto 0;
-  background-image: none;
-  background-color: transparent;
-  border: 0;
 }