diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-06 14:48:17 -0500 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-06 22:28:44 -0500 |
commit | 5bc58bac2678aed9c8b2318f9f4d4825baa2b110 (patch) | |
tree | f35313fd689afa287f6c93a3d78ce8a0d61cc71c /app/services/deploy_tokens | |
parent | d6450717abefbe4dbf891cb4d285f6c84e44f168 (diff) | |
download | gitlab-ce-5bc58bac2678aed9c8b2318f9f4d4825baa2b110.tar.gz |
Handle limit for datetime attributes on MySQL
The TIMESTAMP data type is used for values that contain both date and
time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to
'2038-01-19 03:14:07' UTC.
A Forever lib class was included to handle future dates for PostgreSQL
and MySQL, also changes were made to DeployToken to enforce Forever.date
Also removes extra conditional from JwtController
Diffstat (limited to 'app/services/deploy_tokens')
-rw-r--r-- | app/services/deploy_tokens/create_service.rb | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/app/services/deploy_tokens/create_service.rb b/app/services/deploy_tokens/create_service.rb index 04977ca4c18..52f545947af 100644 --- a/app/services/deploy_tokens/create_service.rb +++ b/app/services/deploy_tokens/create_service.rb @@ -1,22 +1,7 @@ module DeployTokens class CreateService < BaseService def execute - @project.deploy_tokens.create(deploy_token_params) - end - - private - - def deploy_token_params - params[:expires_at] = expires_at_date - params - end - - def expires_at_date - params[:expires_at].presence || default_expires_at - end - - def default_expires_at - DeployToken::FOREVER + @project.deploy_tokens.create(params) end end end |