Handles default expires_at date directly into DeployToken model

3 files changed, 6 insertions, 4 deletions

diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb
index 8496cc2e4b2..31aa041b00a 100644
--- a/app/helpers/deploy_tokens_helper.rb
+++ b/app/helpers/deploy_tokens_helper.rb
@@ -11,10 +11,10 @@ module DeployTokensHelper
   end
 
   def expires_at_value(expires_at)
-    expires_at unless expires_at >= DeployToken::FUTURE_DATE
+    expires_at unless expires_at >= DeployToken::FOREVER
   end
 
   def show_expire_at?(token)
-    token.expires? && token.expires_at != DeployToken::FUTURE_DATE
+    token.expires? && token.expires_at != DeployToken::FOREVER
   end
 end
diff --git a/app/models/deploy_token.rb b/app/models/deploy_token.rb
index 688540dd67f..bfdc5457157 100644
--- a/app/models/deploy_token.rb
+++ b/app/models/deploy_token.rb
@@ -4,7 +4,9 @@ class DeployToken < ActiveRecord::Base
   add_authentication_token_field :token
 
   AVAILABLE_SCOPES = %i(read_repository read_registry).freeze
-  FUTURE_DATE = Date.new(3000 - 01 - 01)
+  FOREVER = DateTime.new(3000, 1, 1)
+
+  default_value_for :expires_at, FOREVER
 
   has_many :project_deploy_tokens, inverse_of: :deploy_token
   has_many :projects, through: :project_deploy_tokens
diff --git a/app/services/deploy_tokens/create_service.rb b/app/services/deploy_tokens/create_service.rb
index b5989e0bbf1..04977ca4c18 100644
--- a/app/services/deploy_tokens/create_service.rb
+++ b/app/services/deploy_tokens/create_service.rb
@@ -16,7 +16,7 @@ module DeployTokens
     end
 
     def default_expires_at
-      DeployToken::FUTURE_DATE
+      DeployToken::FOREVER
     end
   end
 end