Add latest changes from gitlab-org/gitlab@master

4 files changed, 2 insertions, 84 deletions

diff --git a/app/services/groups/participants_service.rb b/app/services/groups/participants_service.rb
index a2238264295..7b68b435f14 100644
--- a/app/services/groups/participants_service.rb
+++ b/app/services/groups/participants_service.rb
@@ -12,8 +12,8 @@ module Groups
         noteable_owner +
         participants_in_noteable +
         all_members +
-        groups +
-        group_hierarchy_users
+        group_hierarchy_users +
+        groups
 
       render_participants_as_hash(participants.uniq)
     end
diff --git a/app/services/merge_requests/create_ref_service.rb b/app/services/merge_requests/create_ref_service.rb
index eae6845335a..1e5e127072e 100644
--- a/app/services/merge_requests/create_ref_service.rb
+++ b/app/services/merge_requests/create_ref_service.rb
@@ -35,8 +35,6 @@ module MergeRequests
       result = maybe_rebase!(**result)
       result = maybe_merge!(**result)
 
-      update_merge_request!(merge_request, result)
-
       ServiceResponse.success(payload: result)
     rescue CreateRefError => error
       ServiceResponse.error(message: error.message)
@@ -118,10 +116,6 @@ module MergeRequests
       ).compact
     end
 
-    def update_merge_request!(merge_request, result)
-      # overridden in EE
-    end
-
     def safe_gitaly_operation
       yield
     rescue Gitlab::Git::PreReceiveError, Gitlab::Git::CommandError, ArgumentError => error
diff --git a/app/services/namespaces/in_product_marketing_emails_service.rb b/app/services/namespaces/in_product_marketing_emails_service.rb
deleted file mode 100644
index 14e670126c6..00000000000
--- a/app/services/namespaces/in_product_marketing_emails_service.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Namespaces
-  class InProductMarketingEmailsService
-    TRACKS = {
-      create: {
-        interval_days: [1, 5, 10],
-        completed_actions: [:created],
-        incomplete_actions: [:git_write]
-      },
-      team_short: {
-        interval_days: [1],
-        completed_actions: [:git_write],
-        incomplete_actions: [:user_added]
-      },
-      trial_short: {
-        interval_days: [2],
-        completed_actions: [:git_write],
-        incomplete_actions: [:trial_started]
-      },
-      admin_verify: {
-        interval_days: [3],
-        completed_actions: [:git_write],
-        incomplete_actions: [:pipeline_created]
-      },
-      verify: {
-        interval_days: [4, 8, 13],
-        completed_actions: [:git_write],
-        incomplete_actions: [:pipeline_created]
-      },
-      trial: {
-        interval_days: [1, 5, 10],
-        completed_actions: [:git_write, :pipeline_created],
-        incomplete_actions: [:trial_started]
-      },
-      team: {
-        interval_days: [1, 5, 10],
-        completed_actions: [:git_write, :pipeline_created, :trial_started],
-        incomplete_actions: [:user_added]
-      }
-    }.freeze
-
-    def self.email_count_for_track(track)
-      interval_days = TRACKS.dig(track.to_sym, :interval_days)
-      interval_days&.count || 0
-    end
-  end
-end
-
-Namespaces::InProductMarketingEmailsService.prepend_mod
diff --git a/app/services/users/in_product_marketing_email_records.rb b/app/services/users/in_product_marketing_email_records.rb
deleted file mode 100644
index fcb252536b3..00000000000
--- a/app/services/users/in_product_marketing_email_records.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Users
-  class InProductMarketingEmailRecords
-    attr_reader :records
-
-    def initialize
-      @records = []
-    end
-
-    def save!
-      Users::InProductMarketingEmail.bulk_insert!(@records)
-      @records = []
-    end
-
-    def add(user, track: nil, series: nil)
-      @records << Users::InProductMarketingEmail.new(
-        user: user,
-        track: track,
-        series: series,
-        created_at: Time.zone.now,
-        updated_at: Time.zone.now
-      )
-    end
-  end
-end