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/views/projects | |
| 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/views/projects')
| -rw-r--r-- | app/views/projects/deploy_tokens/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/deploy_tokens/_table.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/deploy_tokens/_form.html.haml b/app/views/projects/deploy_tokens/_form.html.haml index 4e1a796ade0..f8db30df7b4 100644 --- a/app/views/projects/deploy_tokens/_form.html.haml +++ b/app/views/projects/deploy_tokens/_form.html.haml @@ -10,7 +10,7 @@ .form-group = f.label :expires_at, class: 'label-light' - = f.text_field :expires_at, class: 'datepicker form-control', value: expires_at_value(token.expires_at) + = f.text_field :expires_at, class: 'datepicker form-control', value: f.object.expires_at .form-group = f.label :scopes, class: 'label-light' diff --git a/app/views/projects/deploy_tokens/_table.html.haml b/app/views/projects/deploy_tokens/_table.html.haml index fe9bb1e724a..5013a9b250d 100644 --- a/app/views/projects/deploy_tokens/_table.html.haml +++ b/app/views/projects/deploy_tokens/_table.html.haml @@ -18,7 +18,7 @@ %td= token.username %td= token.created_at.to_date.to_s(:medium) %td - - if show_expire_at?(token) + - if token.expires? %span{ class: ('text-warning' if token.expires_soon?) } In #{distance_of_time_in_words_to_now(token.expires_at)} - else |