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, 3 insertions, 6 deletions

diff --git a/app/assets/javascripts/monitoring/components/monitoring_deployment.vue b/app/assets/javascripts/monitoring/components/monitoring_deployment.vue
index e6432ba3191..dadbcd1aaa6 100644
--- a/app/assets/javascripts/monitoring/components/monitoring_deployment.vue
+++ b/app/assets/javascripts/monitoring/components/monitoring_deployment.vue
@@ -1,8 +1,5 @@
 <script>
-  import {
-      dateFormat,
-      timeFormat,
-    } from '../constants';
+  import { dateFormat, timeFormat } from '../utils/date_time_formatters';
 
   export default {
     props: {
@@ -58,7 +55,7 @@
     class="deploy-info"
     v-if="showDeployInfo">
     <g
-      v-for="(deployment, index) in deploymentData" 
+      v-for="(deployment, index) in deploymentData"
       :key="index"
       :class="nameDeploymentClass(deployment)"
       :transform="transformDeploymentGroup(deployment)">
@@ -92,7 +89,7 @@
           width="90"
           height="58">
         </rect>
-        <g 
+        <g
           transform="translate(5, 2)">
           <text
             class="deploy-info-text text-metric-bold">