Add latest changes from gitlab-org/gitlab@master

4 files changed, 5 insertions, 5 deletions

diff --git a/app/services/design_management/copy_design_collection/copy_service.rb b/app/services/design_management/copy_design_collection/copy_service.rb
index d391c13696f..3d78ad80f0f 100644
--- a/app/services/design_management/copy_design_collection/copy_service.rb
+++ b/app/services/design_management/copy_design_collection/copy_service.rb
@@ -172,7 +172,7 @@ module DesignManagement
       def copy_designs!
         design_attributes = attributes_config[:design_attributes]
 
-        ::DesignManagement::Design.with_project_iid_supply(target_project) do |supply|
+        DesignManagement::Design.with_project_iid_supply(target_project) do |supply|
           new_rows = designs.each_with_index.map do |design, i|
             design.attributes.slice(*design_attributes).merge(
               issue_id: target_issue.id,
diff --git a/app/services/design_management/runs_design_actions.rb b/app/services/design_management/runs_design_actions.rb
index 62db7824592..d1a792c5c88 100644
--- a/app/services/design_management/runs_design_actions.rb
+++ b/app/services/design_management/runs_design_actions.rb
@@ -22,7 +22,7 @@ module DesignManagement
         actions: actions.map(&:gitaly_action)
       )
 
-      ::DesignManagement::Version
+      DesignManagement::Version
         .create_for_designs(actions, sha, current_user)
         .tap { |version| post_process(version, skip_system_notes) }
     end
@@ -31,7 +31,7 @@ module DesignManagement
 
     def post_process(version, skip_system_notes)
       version.run_after_commit_or_now do
-        ::DesignManagement::NewVersionWorker.perform_async(id, skip_system_notes)
+        DesignManagement::NewVersionWorker.perform_async(id, skip_system_notes)
       end
     end
   end
diff --git a/app/services/design_management/save_designs_service.rb b/app/services/design_management/save_designs_service.rb
index 4c4e34862e8..f9f2f4bf290 100644
--- a/app/services/design_management/save_designs_service.rb
+++ b/app/services/design_management/save_designs_service.rb
@@ -35,7 +35,7 @@ module DesignManagement
     attr_reader :files
 
     def upload_designs!
-      ::DesignManagement::Version.with_lock(project.id, repository) do
+      DesignManagement::Version.with_lock(project.id, repository) do
         actions = build_actions
 
         [
diff --git a/app/services/users/destroy_service.rb b/app/services/users/destroy_service.rb
index a0e1167836b..e4b593e3140 100644
--- a/app/services/users/destroy_service.rb
+++ b/app/services/users/destroy_service.rb
@@ -53,7 +53,7 @@ module Users
       # Load the records. Groups are unavailable after membership is destroyed.
       solo_owned_groups = user.solo_owned_groups.load
 
-      user.members.each_batch { |batch| batch.destroy_all } # rubocop:disable Style/SymbolProc, Cop/DestroyAll
+      user.members.each_batch { |batch| batch.destroy_all } # rubocop:disable Cop/DestroyAll
 
       solo_owned_groups.each do |group|
         Groups::DestroyService.new(group, current_user).execute