diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-26 00:45:03 +0000 |
| commit | 0efbc126d080892214d312a3ae2549f1fc341cb6 (patch) | |
| tree | b7131288bcbc3c5b0160ad55ed4b95523ce71c12 /app/assets/javascripts/sidebar/components | |
| parent | 46e3ad4b948dedf67245708493ee17c4429f8bf3 (diff) | |
| parent | 679c0048a8f679aad456c02e30486150bbd0d93d (diff) | |
| download | gitlab-ce-0efbc126d080892214d312a3ae2549f1fc341cb6.tar.gz | |
Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4
# Conflicts:
# app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
Diffstat (limited to 'app/assets/javascripts/sidebar/components')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue index a7bffa81045..259858e4b46 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue @@ -1,6 +1,6 @@ <script> import { __, sprintf } from '~/locale'; -import { abbreviateTime } from '~/lib/utils/pretty_time'; +import { abbreviateTime } from '~/lib/utils/datetime_utility'; import icon from '~/vue_shared/components/icon.vue'; import tooltip from '~/vue_shared/directives/tooltip'; diff --git a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue index dc599e1b9fc..e74912d628f 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue @@ -1,5 +1,5 @@ <script> -import { parseSeconds, stringifyTime } from '../../../lib/utils/pretty_time'; +import { parseSeconds, stringifyTime } from '~/lib/utils/datetime_utility'; import tooltip from '../../../vue_shared/directives/tooltip'; export default { |