Merge branch '3879-suppress-mergeable-selector-in-ee-only-files' into 'master'

Suppress MergeableSelector warning candidates in EE-only files

Closes #3879

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

app/assets/stylesheets/pages/ee_start_trial.scss

@@ -5,14 +5,14 @@
   top: 52px;
 }
 
-/* Secondary Nav Overrides - Old Nav */
 .page-with-sidebar.has-trial-banner {
+  /* Secondary Nav Overrides - Old Nav */
   margin-top: 102px;
-}
 
-/* Sidebar Nav Overrides - New Nav */
-.page-with-sidebar.has-trial-banner .nav-sidebar {
-  top: 102px;
+  /* Sidebar Nav Overrides - New Nav */
+  .nav-sidebar {
+    top: 102px;
+  }
 }
 
 /* Trial Banner */
@@ -30,6 +30,9 @@
   .close {
     color: $white-dark;
     opacity: 0.7;
+    position: absolute;
+    top: 12px;
+    right: $gl-padding;
 
     &:hover {
       color: $black;
@@ -45,12 +48,6 @@
       text-decoration: underline;
     }
   }
-
-  .close {
-    position: absolute;
-    top: 12px;
-    right: $gl-padding;
-  }
 }
 
 /* Trial License Install Modal */
@@ -74,9 +71,6 @@
     .confirmation-desc {
       max-width: 80%;
       margin: auto;
-    }
-
-    .confirmation-desc {
       color: $gl-text-color-secondary;
     }
 
@@ -87,10 +81,8 @@
       overflow-y: auto;
     }
   }
-}
 
-/* Pure CSS License Key Preview Toggle */
-.modal-upload-trial-license {
+  /* Pure CSS License Key Preview Toggle */
   .trial-license-preview,
   .show-license,
   .hide-license:target {

app/assets/stylesheets/pages/environments.scss

@@ -129,77 +129,89 @@
 /**
  * Deploy boards
  */
+.deploy-board {
+  padding: 10px;
+  background-color: $gray-light;
+  min-height: 20px;
 
-.deploy-board > div {
-  display: flex;
-  justify-content: space-between;
+  .fa-spinner {
+    margin: 0 auto;
+    width: 20px;
+    display: block;
+    font-size: 20px;
+  }
 
-  .deploy-board-information {
-    order: 1;
+  > div {
     display: flex;
-    width: 70px;
-    flex-wrap: wrap;
-    justify-content: center;
-    margin: 20px 0 20px 5px;
+    justify-content: space-between;
 
-    > span {
-      text-align: center;
-    }
+    .deploy-board-information {
+      order: 1;
+      display: flex;
+      width: 70px;
+      flex-wrap: wrap;
+      justify-content: center;
+      margin: 20px 0 20px 5px;
 
-    .percentage {
-      color: $gl-text-color;
-    }
+      > span {
+        text-align: center;
+      }
 
-    .text {
-      color: $gl-text-color-secondary;
+      .percentage {
+        color: $gl-text-color;
+      }
+
+      .text {
+        color: $gl-text-color-secondary;
+      }
     }
-  }
 
-  .deploy-board-instances {
-    order: 2;
-    margin-left: 20px;
-    width: 100%;
+    .deploy-board-instances {
+      order: 2;
+      margin-left: 20px;
+      width: 100%;
 
-    .text {
-      color: $gl-text-color-secondary;
-      font-size: 12px;
-    }
+      .text {
+        color: $gl-text-color-secondary;
+        font-size: 12px;
+      }
 
-    .deploy-board-instances-container {
-      display: flex;
-      flex-wrap: wrap;
-      flex-direction: row;
-      margin-top: -8px;
+      .deploy-board-instances-container {
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: row;
+        margin-top: -8px;
+      }
     }
-  }
 
-  .deploy-board-actions {
-    order: 3;
-    align-self: center;
-    min-width: 150px;
-    margin-left: 10px;
-  }
+    .deploy-board-actions {
+      order: 3;
+      align-self: center;
+      min-width: 150px;
+      margin-left: 10px;
+    }
 
-  &.deploy-board-error-message {
-    justify-content: center;
-  }
+    &.deploy-board-error-message {
+      justify-content: center;
+    }
 
-  .deploy-board-empty-state-svg {
-    order: 1;
-    width: 90px;
-    margin: auto 0 auto 20px;
-  }
+    .deploy-board-empty-state-svg {
+      order: 1;
+      width: 90px;
+      margin: auto 0 auto 20px;
+    }
 
-  .deploy-board-empty-state-text {
-    order: 2;
-    flex-wrap: wrap;
-    margin: auto auto 15px 0;
+    .deploy-board-empty-state-text {
+      order: 2;
+      flex-wrap: wrap;
+      margin: auto auto 15px 0;
 
-    .title {
-      order: 1;
-      display: flex;
-      font-size: 17px;
-      line-height: 40px;
+      .title {
+        order: 1;
+        display: flex;
+        font-size: 17px;
+        line-height: 40px;
+      }
     }
   }
 }
@@ -272,18 +284,7 @@
   }
 }
 
-.deploy-board {
-  padding: 10px;
-  background-color: $gray-light;
-  min-height: 20px;
 
-  .fa-spinner {
-    margin: 0 auto;
-    width: 20px;
-    display: block;
-    font-size: 20px;
-  }
-}
 
 .gl-responsive-table-row {
   .branch-commit {

app/assets/stylesheets/pages/projects.scss

@@ -558,17 +558,6 @@ a.deploy-project-label {
   }
 }
 
-.fork-thumbnail-container {
-  display: flex;
-  flex-wrap: wrap;
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
-
-  > h5 {
-    width: 100%;
-  }
-}
-
 .project-template {
   > .form-group {
     margin-bottom: 0;
@@ -1056,19 +1045,16 @@ a.allowed-to-push {
       border-right: solid 1px transparent;
     }
   }
-}
-
-.disabled-item {
-  @extend .btn.disabled;
-}
 
-.protected-branches-list,
-.protected-tags-list {
   .flash-container {
     padding: 0;
   }
 }
 
+.disabled-item {
+  @extend .btn.disabled;
+}
+
 .protected-tags-list {
   .dropdown-menu-toggle {
     width: 100%;

app/assets/stylesheets/pages/promotions.scss

@@ -40,34 +40,33 @@
     }
 
   }
-}
 
-.user-callout.promotion-callout.promotion-empty-page {
-  margin-top: 56px;
-}
+  &.promotion-empty-page {
+    margin-top: 56px;
+  }
 
-.user-callout.promotion-callout.promotion-advanced-search {
-  margin: 0;
-  border-bottom: solid 1px $border-color;
+  &.promotion-advanced-search {
+    margin: 0;
+    border-bottom: solid 1px $border-color;
 
-  h5 {
-    margin-top: 0;
-  }
+    h5 {
+      margin-top: 0;
+    }
 
-  .bordered-box.content-block {
-    border: none;
-    padding: 20px 0;
-    justify-content: left;
+    .bordered-box.content-block {
+      border: none;
+      padding: 20px 0;
+      justify-content: left;
 
-    svg {
-      height: auto;
+      svg {
+        height: auto;
+      }
     }
-  }
 
-  .user-callout-copy {
-    margin-left: 0;
+    .user-callout-copy {
+      margin-left: 0;
+    }
   }
-
 }
 
 .promotion-modal {

changelogs/unreleased-ee/3879-suppress-mergeable-selector-in-ee-only-files.yml

+---
+title: Suppress MergeableSelector warning candidates in EE-only files
+merge_request: 3225
+author: Takuya Noguchi
+type: other