diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-12-14 07:38:48 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-12-14 07:38:48 +0000 |
commit | 9daeccfb3ae70bd394be21ac2c1ed87b44cef7fe (patch) | |
tree | 2f7a69da544ce60243224c8f70e3b17e8e9927a3 /app/assets/javascripts/vue_shared | |
parent | 54c2d7bdbddc18953571ed928948c18471d6edfa (diff) | |
parent | 114f93cccff08771dab7c7d11cc24d73960f0fc5 (diff) | |
download | gitlab-ce-9daeccfb3ae70bd394be21ac2c1ed87b44cef7fe.tar.gz |
Merge branch '38869-datetime' into 'master'
Export date utility functions as ES6 modules
See merge request gitlab-org/gitlab-ce!15782
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/memory_graph.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/mixins/timeago.js | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/memory_graph.js b/app/assets/javascripts/vue_shared/components/memory_graph.js index 643b77e04c7..f37ef1a5ca3 100644 --- a/app/assets/javascripts/vue_shared/components/memory_graph.js +++ b/app/assets/javascripts/vue_shared/components/memory_graph.js @@ -1,3 +1,5 @@ +import { getTimeago } from '../../lib/utils/datetime_utility'; + export default { name: 'MemoryGraph', props: { @@ -16,7 +18,7 @@ export default { }, computed: { getFormattedMedian() { - const deployedSince = gl.utils.getTimeago().format(this.deploymentTime * 1000); + const deployedSince = getTimeago().format(this.deploymentTime * 1000); return `Deployed ${deployedSince}`; }, }, diff --git a/app/assets/javascripts/vue_shared/mixins/timeago.js b/app/assets/javascripts/vue_shared/mixins/timeago.js index 20f63ab663c..4e3b9d7b767 100644 --- a/app/assets/javascripts/vue_shared/mixins/timeago.js +++ b/app/assets/javascripts/vue_shared/mixins/timeago.js @@ -1,4 +1,4 @@ -import '../../lib/utils/datetime_utility'; +import { formatDate, getTimeago } from '../../lib/utils/datetime_utility'; /** * Mixin with time ago methods used in some vue components @@ -6,13 +6,13 @@ import '../../lib/utils/datetime_utility'; export default { methods: { timeFormated(time) { - const timeago = gl.utils.getTimeago(); + const timeago = getTimeago(); return timeago.format(time); }, tooltipTitle(time) { - return gl.utils.formatDate(time); + return formatDate(time); }, }, }; |