diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/logs | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/logs')
| -rw-r--r-- | app/assets/javascripts/logs/components/environment_logs.vue | 8 | ||||
| -rw-r--r-- | app/assets/javascripts/logs/components/tokens/token_with_loading_state.vue | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/logs/components/environment_logs.vue b/app/assets/javascripts/logs/components/environment_logs.vue index 39041aa1447..3db9fa01629 100644 --- a/app/assets/javascripts/logs/components/environment_logs.vue +++ b/app/assets/javascripts/logs/components/environment_logs.vue @@ -29,9 +29,6 @@ export default { LogAdvancedFilters, LogControlButtons, }, - filters: { - formatDate, - }, props: { environmentName: { type: String, @@ -114,6 +111,7 @@ export default { const { scrollTop = 0, clientHeight = 0, scrollHeight = 0 } = target; this.scrollDownButtonDisabled = scrollTop + clientHeight === scrollHeight; }, 200), + formatDate, }, }; </script> @@ -229,8 +227,8 @@ export default { <div ref="logFooter" class="py-2 px-3 text-white bg-secondary-900"> <gl-sprintf :message="s__('Environments|Logs from %{start} to %{end}.')"> - <template #start>{{ timeRange.current.start | formatDate }}</template> - <template #end>{{ timeRange.current.end | formatDate }}</template> + <template #start>{{ formatDate(timeRange.current.start) }}</template> + <template #end>{{ formatDate(timeRange.current.end) }}</template> </gl-sprintf> <gl-sprintf v-if="!logs.isComplete" diff --git a/app/assets/javascripts/logs/components/tokens/token_with_loading_state.vue b/app/assets/javascripts/logs/components/tokens/token_with_loading_state.vue index f8ce704942b..4e672c1d121 100644 --- a/app/assets/javascripts/logs/components/tokens/token_with_loading_state.vue +++ b/app/assets/javascripts/logs/components/tokens/token_with_loading_state.vue @@ -20,7 +20,7 @@ export default { <gl-filtered-search-token :config="config" v-bind="{ ...$attrs }" v-on="$listeners"> <template #suggestions> <div class="m-1"> - <gl-loading-icon v-if="config.loading" /> + <gl-loading-icon v-if="config.loading" size="sm" /> <div v-else class="py-1 px-2 text-muted"> {{ config.noOptionsText }} </div> |