Add latest changes from gitlab-org/gitlab@master

14 files changed, 14 insertions, 18 deletions

diff --git a/app/models/award_emoji.rb b/app/models/award_emoji.rb
index 73e3fa709b0..e445d08a096 100644
--- a/app/models/award_emoji.rb
+++ b/app/models/award_emoji.rb
@@ -9,7 +9,7 @@ class AwardEmoji < ApplicationRecord
   include Importable
   include IgnorableColumns
 
-  ignore_column :awardable_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :awardable_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   belongs_to :awardable, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations
   belongs_to :user
diff --git a/app/models/ci/ref.rb b/app/models/ci/ref.rb
index a54d0b1d1db..8655e8eb9b8 100644
--- a/app/models/ci/ref.rb
+++ b/app/models/ci/ref.rb
@@ -36,11 +36,7 @@ module Ci
         next unless ci_ref.artifacts_locked?
 
         ci_ref.run_after_commit do
-          if Feature.enabled?(:ci_unlock_pipelines_queue, ci_ref.project)
-            Ci::Refs::UnlockPreviousPipelinesWorker.perform_async(ci_ref.id)
-          else
-            Ci::PipelineSuccessUnlockArtifactsWorker.perform_async(ci_ref.last_finished_pipeline_id)
-          end
+          Ci::Refs::UnlockPreviousPipelinesWorker.perform_async(ci_ref.id)
         end
       end
     end
diff --git a/app/models/commit_user_mention.rb b/app/models/commit_user_mention.rb
index 9215e15f07d..fa7f065b6b4 100644
--- a/app/models/commit_user_mention.rb
+++ b/app/models/commit_user_mention.rb
@@ -3,7 +3,7 @@
 class CommitUserMention < UserMention
   include IgnorableColumns
 
-  ignore_column :note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   belongs_to :note
 end
diff --git a/app/models/design_user_mention.rb b/app/models/design_user_mention.rb
index 7d0cd72e9eb..ba1ef1b5712 100644
--- a/app/models/design_user_mention.rb
+++ b/app/models/design_user_mention.rb
@@ -3,7 +3,7 @@
 class DesignUserMention < UserMention
   include IgnorableColumns
 
-  ignore_column :note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   belongs_to :design, class_name: 'DesignManagement::Design'
   belongs_to :note
diff --git a/app/models/event.rb b/app/models/event.rb
index 9e4a662aaa5..7de7ad8ccd6 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -12,7 +12,7 @@ class Event < ApplicationRecord
   include IgnorableColumns
   include EachBatch
 
-  ignore_column :target_id_convert_to_bigint, remove_with: '16.4', remove_after: '2023-09-22'
+  ignore_column :target_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   ACTIONS = HashWithIndifferentAccess.new(
     created: 1,
diff --git a/app/models/issue_user_mention.rb b/app/models/issue_user_mention.rb
index ad0df0dca78..6c3bedfccca 100644
--- a/app/models/issue_user_mention.rb
+++ b/app/models/issue_user_mention.rb
@@ -5,5 +5,5 @@ class IssueUserMention < UserMention
   belongs_to :note
   include IgnorableColumns
 
-  ignore_column :note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 end
diff --git a/app/models/merge_request_user_mention.rb b/app/models/merge_request_user_mention.rb
index 3157f1ca2aa..548a91162cd 100644
--- a/app/models/merge_request_user_mention.rb
+++ b/app/models/merge_request_user_mention.rb
@@ -3,7 +3,7 @@
 class MergeRequestUserMention < UserMention
   include IgnorableColumns
 
-  ignore_column :note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   belongs_to :merge_request
   belongs_to :note
diff --git a/app/models/note.rb b/app/models/note.rb
index 64e8bb6ca17..eae7a40fb4e 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -26,7 +26,7 @@ class Note < ApplicationRecord
   include IgnorableColumns
   include Spammable
 
-  ignore_column :id_convert_to_bigint, remove_with: '16.3', remove_after: '2023-08-22'
+  ignore_column :id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   ISSUE_TASK_SYSTEM_NOTE_PATTERN = /\A.*marked\sthe\stask.+as\s(completed|incomplete).*\z/
 
diff --git a/app/models/note_diff_file.rb b/app/models/note_diff_file.rb
index b0f6af0d853..624a722e369 100644
--- a/app/models/note_diff_file.rb
+++ b/app/models/note_diff_file.rb
@@ -4,7 +4,7 @@ class NoteDiffFile < ApplicationRecord
   include DiffFile
   include IgnorableColumns
 
-  ignore_column :diff_note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :diff_note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   scope :referencing_sha, -> (oids, project_id:) do
     joins(:diff_note).where(notes: { project_id: project_id, commit_id: oids })
diff --git a/app/models/snippet_user_mention.rb b/app/models/snippet_user_mention.rb
index 8ef2c579a5a..2b6845495bc 100644
--- a/app/models/snippet_user_mention.rb
+++ b/app/models/snippet_user_mention.rb
@@ -3,7 +3,7 @@
 class SnippetUserMention < UserMention
   include IgnorableColumns
 
-  ignore_column :note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   belongs_to :snippet
   belongs_to :note
diff --git a/app/models/suggestion.rb b/app/models/suggestion.rb
index 58a154b8986..c4178d3c5f1 100644
--- a/app/models/suggestion.rb
+++ b/app/models/suggestion.rb
@@ -5,7 +5,7 @@ class Suggestion < ApplicationRecord
   include Suggestible
   include IgnorableColumns
 
-  ignore_column :note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   belongs_to :note, inverse_of: :suggestions
   validates :note, presence: true, unless: :importing?
diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb
index 4e71a13a3a1..dc93decce5e 100644
--- a/app/models/system_note_metadata.rb
+++ b/app/models/system_note_metadata.rb
@@ -4,7 +4,7 @@ class SystemNoteMetadata < ApplicationRecord
   include Importable
   include IgnorableColumns
 
-  ignore_column :note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   # These notes's action text might contain a reference that is external.
   # We should always force a deep validation upon references that are found
diff --git a/app/models/timelog.rb b/app/models/timelog.rb
index eb72456b435..b6b4decc64b 100644
--- a/app/models/timelog.rb
+++ b/app/models/timelog.rb
@@ -5,7 +5,7 @@ class Timelog < ApplicationRecord
   include IgnorableColumns
   include Sortable
 
-  ignore_column :note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   before_save :set_project
 
diff --git a/app/models/todo.rb b/app/models/todo.rb
index c49ed1093e1..e64dbf83a4c 100644
--- a/app/models/todo.rb
+++ b/app/models/todo.rb
@@ -6,7 +6,7 @@ class Todo < ApplicationRecord
   include EachBatch
   include IgnorableColumns
 
-  ignore_column :note_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22'
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.7', remove_after: '2023-11-16'
 
   # Time to wait for todos being removed when not visible for user anymore.
   # Prevents TODOs being removed by mistake, for example, removing access from a user