Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 75 deletions

diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index 0e57fc325c2..e236c264f5c 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -44,13 +44,10 @@
 }
 
 .border-width-1px { border-width: 1px; }
-.border-bottom-width-1px { border-bottom-width: 1px; }
 .border-style-dashed { border-style: dashed; }
 .border-style-solid { border-style: solid; }
-.border-bottom-style-solid { border-bottom-style: solid; }
 .border-color-blue-300 { border-color: $blue-300; }
 .border-color-default { border-color: $border-color; }
-.border-bottom-color-default { border-bottom-color: $border-color; }
 .border-radius-default { border-radius: $border-radius-default; }
 .border-radius-small { border-radius: $border-radius-small; }
 .box-shadow-default { box-shadow: 0 2px 4px 0 $black-transparent; }
@@ -95,11 +92,6 @@
   padding-bottom: $gl-spacing-scale-8;
 }
 
-// move this to GitLab UI once onboarding experiment is considered a success
-.gl-pl-7 {
-  padding-left: $gl-spacing-scale-7;
-}
-
 .gl-transition-property-stroke-opacity {
   transition-property: stroke-opacity;
 }
@@ -116,47 +108,6 @@
   box-shadow: inset 0 0 3px $gl-border-size-1 $blue-500;
 }
 
-
-.gl-sm-align-items-flex-end {
-  @media (min-width: $breakpoint-sm) {
-    align-items: flex-end;
-  }
-}
-
-.gl-sm-text-body {
-  @media (min-width: $breakpoint-sm) {
-    color: $body-color;
-  }
-}
-
-.gl-sm-font-weight-bold {
-  @media (min-width: $breakpoint-sm) {
-    font-weight: $gl-font-weight-bold;
-  }
-}
-
-.gl-min-h-6 {
-  min-height: $gl-spacing-scale-6;
-}
-
-.gl-md-justify-content-end {
-  @media (min-width: $breakpoint-md) {
-    width: auto !important;
-  }
-}
-
-.gl-display-md-flex {
-  @media (min-width: $breakpoint-md) {
-    display: flex;
-  }
-}
-
-.gl-display-md-none {
-  @media (min-width: $breakpoint-md) {
-    display: none;
-  }
-}
-
 // This utility is used to force the z-index to match that of dropdown menu's
 .gl-z-dropdown-menu\! {
   z-index: 300 !important;
diff --git a/app/models/resource_weight_event.rb b/app/models/resource_weight_event.rb
deleted file mode 100644
index a261f3a1bd7..00000000000
--- a/app/models/resource_weight_event.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class ResourceWeightEvent < ResourceEvent
-  include IssueResourceEvent
-
-  validates :issue, presence: true
-
-  after_save :usage_metrics
-
-  private
-
-  def usage_metrics
-    Gitlab::UsageDataCounters::IssueActivityUniqueCounter.track_issue_weight_changed_action(author: user)
-  end
-end
diff --git a/app/services/issuable/clone/attributes_rewriter.rb b/app/services/issuable/clone/attributes_rewriter.rb
index c84074039ea..3861d88bce9 100644
--- a/app/services/issuable/clone/attributes_rewriter.rb
+++ b/app/services/issuable/clone/attributes_rewriter.rb
@@ -18,7 +18,6 @@ module Issuable
         new_entity.update(update_attributes)
 
         copy_resource_label_events
-        copy_resource_weight_events
         copy_resource_milestone_events
         copy_resource_state_events
       end
@@ -55,16 +54,6 @@ module Issuable
         end
       end
 
-      def copy_resource_weight_events
-        return unless both_respond_to?(:resource_weight_events)
-
-        copy_events(ResourceWeightEvent.table_name, original_entity.resource_weight_events) do |event|
-          event.attributes
-            .except('id', 'reference', 'reference_html')
-            .merge('issue_id' => new_entity.id)
-        end
-      end
-
       def copy_resource_milestone_events
         return unless milestone_events_supported?
 
@@ -128,3 +117,5 @@ module Issuable
     end
   end
 end
+
+Issuable::Clone::AttributesRewriter.prepend_if_ee('EE::Issuable::Clone::AttributesRewriter')