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/helpers/deploy_tokens_helper.rb | |
| 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/helpers/deploy_tokens_helper.rb')
| -rw-r--r-- | app/helpers/deploy_tokens_helper.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb index 31aa041b00a..bd921322476 100644 --- a/app/helpers/deploy_tokens_helper.rb +++ b/app/helpers/deploy_tokens_helper.rb @@ -9,12 +9,4 @@ module DeployTokensHelper Gitlab.config.registry.enabled && can?(current_user, :read_container_image, project) end - - def expires_at_value(expires_at) - expires_at unless expires_at >= DeployToken::FOREVER - end - - def show_expire_at?(token) - token.expires? && token.expires_at != DeployToken::FOREVER - end end |