Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 158 deletions

diff --git a/app/assets/javascripts/experimentation/utils.js b/app/assets/javascripts/experimentation/utils.js
index 9079c238169..624a04fd7c2 100644
--- a/app/assets/javascripts/experimentation/utils.js
+++ b/app/assets/javascripts/experimentation/utils.js
@@ -1,5 +1,5 @@
 // This file only applies to use of experiments through https://gitlab.com/gitlab-org/gitlab-experiment
-import { get, pick } from 'lodash';
+import { get } from 'lodash';
 import { DEFAULT_VARIANT, CANDIDATE_VARIANT, TRACKING_CONTEXT_SCHEMA } from './constants';
 
 function getExperimentsData() {
@@ -14,12 +14,6 @@ export function getExperimentData(experimentName) {
   return getExperimentsData()[experimentName];
 }
 
-export function getExperimentContexts(...experimentNames) {
-  return Object.values(pick(getExperimentsData(), experimentNames)).map(
-    convertExperimentDataToExperimentContext,
-  );
-}
-
 export function getAllExperimentContexts() {
   return Object.values(getExperimentsData()).map(convertExperimentDataToExperimentContext);
 }
diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss
index d233adbf3d2..de27ca2e5e8 100644
--- a/app/assets/stylesheets/pages/clusters.scss
+++ b/app/assets/stylesheets/pages/clusters.scss
@@ -1,88 +1,4 @@
-.edit-cluster-form {
-  .clipboard-addon {
-    background-color: $white;
-  }
-}
-
-.cluster-application-row {
-  background: $gray-lighter;
-
-  &.cluster-application-installed {
-    background: none;
-  }
-
-  .settings-message {
-    padding: $gl-vert-padding $gl-padding-8;
-  }
-}
-
-@media (min-width: map-get($grid-breakpoints, md)) {
-  .cluster-application-list {
-    border: 1px solid $border-color;
-    border-radius: $border-radius-default;
-  }
-
-  .cluster-application-row {
-    border-bottom: 1px solid $border-color;
-    padding: $gl-padding;
-
-    &:last-child {
-      border-bottom: 0;
-      border-bottom-left-radius: calc(#{$border-radius-default} - 1px);
-      border-bottom-right-radius: calc(#{$border-radius-default} - 1px);
-    }
-  }
-}
-
-.cluster-application-logo {
-  border: 3px solid $white;
-  box-shadow: 0 0 0 1px $gray-normal;
-
-  &.avatar:hover {
-    border-color: $white;
-  }
-}
-
-.cluster-application-warning {
-  font-weight: bold;
-  text-align: center;
-  padding: $gl-padding;
-  border-bottom: 1px solid $white-normal;
-
-  .svg-container {
-    display: inline-block;
-    vertical-align: middle;
-    margin-right: $gl-padding-8;
-    width: 40px;
-    height: 40px;
-  }
-}
-
-.cluster-application-description {
-  flex: 1;
-}
-
-.cluster-application-disabled {
-  opacity: 0.5;
-}
-
-.clusters-dropdown-menu {
-  max-width: 100%;
-}
-
-.clusters-error-alert {
-  width: 100%;
-}
-
 .clusters-container {
-  .nav-bar-right {
-    padding: $gl-padding-top $gl-padding;
-  }
-
-  .card {
-    margin-bottom: $gl-vert-padding;
-  }
-
   .empty-state .svg-content img {
     width: 145px;
   }
@@ -100,71 +16,4 @@
       @include gl-flex-wrap;
     }
   }
-
-  .top-area .nav-controls > .btn.btn-add-cluster {
-    margin-right: 0;
-  }
-
-  .clusters-table {
-    background-color: $gray-light;
-    padding: $gl-padding-8;
-  }
-
-  .badge-light {
-    background-color: $white-normal;
-  }
-
-  .gl-responsive-table-row {
-    padding: $gl-padding;
-    border: 0;
-
-    &.table-row-header {
-      // stylelint-disable-next-line
-      background-color: none;
-      border: 0;
-      font-weight: bold;
-      color: $gray-500;
-    }
-  }
-}
-
-.cluster-warning {
-  @include alert-variant(theme-color-level('warning', $alert-bg-level), theme-color-level('warning', $alert-border-level), theme-color-level('warning', $alert-color-level));
-}
-
-.gcp-signup-offer {
-  border-left-color: $blue-500;
-
-  svg {
-    fill: $blue-500;
-    vertical-align: middle;
-  }
-
-  .gcp-signup-offer--content {
-    display: flex;
-
-    h4 {
-      font-size: 16px;
-      line-height: 24px;
-    }
-
-    .gcp-signup-offer--icon {
-      align-self: flex-start;
-    }
-  }
-}
-
-.cluster-deployments-warning {
-  color: $orange-500;
-}
-
-.badge.pods-badge {
-  color: $black;
-  font-weight: $gl-font-weight-bold;
-}
-
-.cluster-status-indicator {
-  &.disabled {
-    background-color: $gray-400;
-  }
 }