summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-05 22:03:10 +0300
committerFatih Acet <acetfatih@gmail.com>2016-10-05 22:03:10 +0300
commit2a6e52f2189f26b13b98cc431b26d1d353697bd4 (patch)
treeafe0c7b26c94877f1caa280af11278a787861ba3 /app/assets
parentdd6a24d4e746ff65800a5a06374a2f8c0b8a91dd (diff)
parent966bbb9f3110e1bb390334653caedec55cc8c6a3 (diff)
downloadgitlab-ce-2a6e52f2189f26b13b98cc431b26d1d353697bd4.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b-existing
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/build.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index 78d21c0552a..f336bfc36d6 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -146,7 +146,7 @@
$date = $('.js-artifacts-remove');
if ($date.length) {
date = $date.text();
- return $date.text($.timefor(new Date(date.replace(/-/g, '/')), ' '));
+ return $date.text($.timefor(new Date(date.replace(/([0-9]+)-([0-9]+)-([0-9]+)/g, '$1/$2/$3')), ' '));
}
};