Merge remote-tracking branch 'upstream/master' into perf.slow-issuable

* upstream/master: (206 commits)
  Resolve "Monitoring graph date formatting is wrong"
  Add styles for shorter code
  Update doc for dind using overlay2
  Cleans merge_jid when possible on MergeService
  Rename MergeRequest#async_merge to merge_async
  Add changelog
  Track enqueued and ongoing MRs
  Remove locked? check when unlocking a merge request
  Update CHANGELOG.md for 9.5.2
  Update rubocop-gitlab-security to 0.1.0
  Fix spec
  Fix changelog
  Fix spec
  Add changelog
  Remove trigger_request.trigger.owner
  Reproduced bug
  Fix a transient failure in mini_pipeline_graph_spec
  fix typo
  fix spec
  Fix events error importing GitLab projects
  ...

1 files changed, 2 insertions, 5 deletions

diff --git a/app/assets/javascripts/monitoring/components/monitoring_flag.vue b/app/assets/javascripts/monitoring/components/monitoring_flag.vue
index 5a0e50fcab3..61cbeeebb17 100644
--- a/app/assets/javascripts/monitoring/components/monitoring_flag.vue
+++ b/app/assets/javascripts/monitoring/components/monitoring_flag.vue
@@ -1,8 +1,5 @@
 <script>
-  import {
-      dateFormat,
-      timeFormat,
-    } from '../constants';
+  import { dateFormat, timeFormat } from '../utils/date_time_formatters';
 
   export default {
     props: {
@@ -72,7 +69,7 @@
       r="5"
       transform="translate(-5, 20)">
     </circle>
-    <svg 
+    <svg
       class="rect-text-metric"
       :x="currentFlagPosition"
       y="0">