Add latest changes from gitlab-org/gitlab@master

5 files changed, 11 insertions, 17 deletions

diff --git a/app/models/bulk_imports/entity.rb b/app/models/bulk_imports/entity.rb
index da620c85676..437118c36e8 100644
--- a/app/models/bulk_imports/entity.rb
+++ b/app/models/bulk_imports/entity.rb
@@ -144,9 +144,9 @@ class BulkImports::Entity < ApplicationRecord
     File.join(base_resource_path, 'export_relations')
   end
 
-  def export_relations_url_path
-    if bulk_import.supports_batched_export?
-      Gitlab::Utils.add_url_parameters(export_relations_url_path_base, batched: true)
+  def export_relations_url_path(batched: false)
+    if batched && bulk_import.supports_batched_export?
+      Gitlab::Utils.add_url_parameters(export_relations_url_path_base, batched: batched)
     else
       export_relations_url_path_base
     end
diff --git a/app/models/group.rb b/app/models/group.rb
index f3a501cfb04..587451ac195 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -885,10 +885,6 @@ class Group < Namespace
     ].compact.min
   end
 
-  def content_editor_on_issues_feature_flag_enabled?
-    feature_flag_enabled_for_self_or_ancestor?(:content_editor_on_issues)
-  end
-
   def work_items_feature_flag_enabled?
     feature_flag_enabled_for_self_or_ancestor?(:work_items)
   end
diff --git a/app/models/integrations/discord.rb b/app/models/integrations/discord.rb
index 6aca9fc9921..7917d17eb62 100644
--- a/app/models/integrations/discord.rb
+++ b/app/models/integrations/discord.rb
@@ -43,7 +43,7 @@ module Integrations
     end
 
     def self.supported_events
-      %w[push issue confidential_issue merge_request note confidential_note tag_push pipeline wiki_page]
+      %w[push issue confidential_issue merge_request note confidential_note tag_push pipeline wiki_page deployment]
     end
 
     def configurable_channels?
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 72b0632f9fd..9ac9f94310d 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1237,13 +1237,14 @@ class MergeRequest < ApplicationRecord
 
   def mergeable?(
     skip_ci_check: false, skip_discussions_check: false, skip_approved_check: false, check_mergeability_retry_lease: false,
-    skip_draft_check: false, skip_rebase_check: false)
+    skip_draft_check: false, skip_rebase_check: false, skip_blocked_check: false)
 
     return false unless mergeable_state?(
       skip_ci_check: skip_ci_check,
-      skip_draft_check: skip_draft_check,
       skip_discussions_check: skip_discussions_check,
-      skip_approved_check: skip_approved_check
+      skip_draft_check: skip_draft_check,
+      skip_approved_check: skip_approved_check,
+      skip_blocked_check: skip_blocked_check
     )
 
     check_mergeability(sync_retry_lease: check_mergeability_retry_lease)
@@ -1276,14 +1277,15 @@ class MergeRequest < ApplicationRecord
 
   def mergeable_state?(
     skip_ci_check: false, skip_discussions_check: false, skip_approved_check: false,
-    skip_draft_check: false)
+    skip_draft_check: false, skip_blocked_check: false)
     additional_checks = execute_merge_checks(
       mergeable_state_checks,
       params: {
         skip_ci_check: skip_ci_check,
         skip_discussions_check: skip_discussions_check,
         skip_approved_check: skip_approved_check,
-        skip_draft_check: skip_draft_check
+        skip_draft_check: skip_draft_check,
+        skip_blocked_check: skip_blocked_check
       }
     )
     additional_checks.success?
diff --git a/app/models/project.rb b/app/models/project.rb
index 2e331c391b1..612931e7d40 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -3187,10 +3187,6 @@ class Project < ApplicationRecord
     creator.banned? && team.max_member_access(creator.id) == Gitlab::Access::OWNER
   end
 
-  def content_editor_on_issues_feature_flag_enabled?
-    group&.content_editor_on_issues_feature_flag_enabled? || Feature.enabled?(:content_editor_on_issues, self)
-  end
-
   def work_items_feature_flag_enabled?
     group&.work_items_feature_flag_enabled? || Feature.enabled?(:work_items, self)
   end