Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 1 insertions, 6 deletions

diff --git a/app/models/release.rb b/app/models/release.rb
index b770f3934ef..0f00732b62e 100644
--- a/app/models/release.rb
+++ b/app/models/release.rb
@@ -11,7 +11,6 @@ class Release < ApplicationRecord
   cache_markdown_field :description
 
   belongs_to :project, touch: true
-  # releases prior to 11.7 have no author
   belongs_to :author, class_name: 'User'
 
   has_many :links, class_name: 'Releases::Link'
@@ -26,7 +25,7 @@ class Release < ApplicationRecord
   before_create :set_released_at
 
   validates :project, :tag, presence: true
-  validates :author_id, presence: true, if: :validate_release_with_author?
+  validates :author_id, presence: true, on: :create
 
   validates :tag, uniqueness: { scope: :project_id }
 
@@ -119,10 +118,6 @@ class Release < ApplicationRecord
     end
   end
 
-  def validate_release_with_author?
-    Feature.enabled?(:validate_release_with_author, self.project)
-  end
-
   def set_released_at
     self.released_at ||= created_at
   end