diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-06 11:23:45 -0500 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-06 21:20:17 -0500 |
| commit | 18a1569319af918fe3aff7564e344143d04d6aca (patch) | |
| tree | 3e52875f9b67abbdf4f3dd6be7b7d8e05963a788 /app/helpers | |
| parent | 8c276580431a750a3141f2ec57690da844a75ac4 (diff) | |
| download | gitlab-ce-18a1569319af918fe3aff7564e344143d04d6aca.tar.gz | |
Handles default expires_at date directly into DeployToken model
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/deploy_tokens_helper.rb | 4 |
1 files changed, 2 insertions, 2 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 |