Add latest changes from gitlab-org/gitlab@13-3-stable-ee

3 files changed, 3 insertions, 3 deletions

diff --git a/app/assets/javascripts/branches/components/divergence_graph.vue b/app/assets/javascripts/branches/components/divergence_graph.vue
index 36fff370ea1..deaed694b46 100644
--- a/app/assets/javascripts/branches/components/divergence_graph.vue
+++ b/app/assets/javascripts/branches/components/divergence_graph.vue
@@ -65,7 +65,7 @@ export default {
     </template>
     <template v-else>
       <graph-bar :count="behindCount" :max-commits="maxCommits" position="left" />
-      <div class="graph-separator pull-left mt-1"></div>
+      <div class="graph-separator float-left mt-1"></div>
       <graph-bar :count="aheadCount" :max-commits="maxCommits" position="right" />
     </template>
   </div>
diff --git a/app/assets/javascripts/branches/components/graph_bar.vue b/app/assets/javascripts/branches/components/graph_bar.vue
index 83da41ca097..21cbcac820a 100644
--- a/app/assets/javascripts/branches/components/graph_bar.vue
+++ b/app/assets/javascripts/branches/components/graph_bar.vue
@@ -56,7 +56,7 @@ export default {
 </script>
 
 <template>
-  <div :class="{ full: isFullWidth }" class="position-relative pull-left pt-1 graph-side h-100">
+  <div :class="{ full: isFullWidth }" class="position-relative float-left pt-1 graph-side h-100">
     <div
       :style="style"
       :class="[roundedClass, positionSideClass]"
diff --git a/app/assets/javascripts/branches/divergence_graph.js b/app/assets/javascripts/branches/divergence_graph.js
index 303735a1807..89e9d3fcb62 100644
--- a/app/assets/javascripts/branches/divergence_graph.js
+++ b/app/assets/javascripts/branches/divergence_graph.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import { __ } from '../locale';
-import createFlash from '../flash';
+import { deprecatedCreateFlash as createFlash } from '../flash';
 import axios from '../lib/utils/axios_utils';
 import DivergenceGraph from './components/divergence_graph.vue';