diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-08-02 15:11:55 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-02 15:11:55 +0000 |
| commit | b6dc87cb28058fdc2d5a735f896742fecb5901ec (patch) | |
| tree | 816b9a911afe76b35d60d5142c41cfea52c8933b | |
| parent | fdadbbe34cc67092bb6e964ab4965dc153e085af (diff) | |
| parent | 6e50719ff8dde5b5d54eea5e8f6fa95c5d0c0c24 (diff) | |
| download | gitlab-ce-b6dc87cb28058fdc2d5a735f896742fecb5901ec.tar.gz | |
Merge branch 'ff-artifacts-date-fix' into 'master'
Fixed artifacts expire date in FF
## What does this MR do?
FireFox was trying to parse the date incorrectly so it would just show 'Past due'
## Screenshots (if relevant)
See merge request !5403
| -rw-r--r-- | app/assets/javascripts/build.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index e135cb92a30..3d9b824d406 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -128,7 +128,7 @@ $date = $('.js-artifacts-remove'); if ($date.length) { date = $date.text(); - return $date.text($.timefor(new Date(date), ' ')); + return $date.text($.timefor(new Date(date.replace(/-/g, '/')), ' ')); } }; |