1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/release.rb b/app/models/release.rb
index a0245105cd9..4c9d89105d7 100644
--- a/app/models/release.rb
+++ b/app/models/release.rb
@@ -18,12 +18,10 @@ class Release < ApplicationRecord
   has_many :milestones, through: :milestone_releases
   has_many :evidences, inverse_of: :release, class_name: 'Releases::Evidence'
 
-  default_value_for :released_at, allows_nil: false do
-    Time.zone.now
-  end
-
   accepts_nested_attributes_for :links, allow_destroy: true
 
+  before_create :set_released_at
+
   validates :project, :tag, presence: true
   validates_associated :milestone_releases, message: -> (_, obj) { obj[:value].map(&:errors).map(&:full_messages).join(",") }
 
@@ -90,6 +88,10 @@ class Release < ApplicationRecord
       repository.find_tag(tag)
     end
   end
+
+  def set_released_at
+    self.released_at ||= created_at
+  end
 end
 
 Release.prepend_if_ee('EE::Release')