diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 00:09:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 00:09:56 +0300 |
| commit | 9facfe5cb194005894467c06e4ea1a9800034ab4 (patch) | |
| tree | 5ceaecd5f89725250bbf4119558715fa14576c4c /app/assets/javascripts/logs | |
| parent | 18da92341dac366b7bcfd13f2d3c443ffa315af0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/logs')
| -rw-r--r-- | app/assets/javascripts/logs/components/log_simple_filters.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/logs/utils.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/logs/components/log_simple_filters.vue b/app/assets/javascripts/logs/components/log_simple_filters.vue index 41514a6ce0e..2e1270b5428 100644 --- a/app/assets/javascripts/logs/components/log_simple_filters.vue +++ b/app/assets/javascripts/logs/components/log_simple_filters.vue @@ -1,5 +1,4 @@ <script> -import { s__ } from '~/locale'; import { mapActions, mapState } from 'vuex'; import { GlIcon, @@ -7,6 +6,7 @@ import { GlDeprecatedDropdownHeader, GlDeprecatedDropdownItem, } from '@gitlab/ui'; +import { s__ } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/logs/utils.js b/app/assets/javascripts/logs/utils.js index 8479eeb3b59..8e537a4025f 100644 --- a/app/assets/javascripts/logs/utils.js +++ b/app/assets/javascripts/logs/utils.js @@ -1,5 +1,5 @@ -import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; import dateFormat from 'dateformat'; +import { secondsToMilliseconds } from '~/lib/utils/datetime_utility'; import { dateFormatMask } from './constants'; /** |