summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/branches
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-04 18:10:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-04 18:10:08 +0000
commitf9ddf689da1edc68c81444a25b3b0d3841382c56 (patch)
treeecab18b41b8cbca55acfc09b19478e1d7af6160a /app/assets/javascripts/branches
parentd4194db620cc5b736bb5737ed5e4eab979ccd7ab (diff)
downloadgitlab-ce-f9ddf689da1edc68c81444a25b3b0d3841382c56.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/branches')
-rw-r--r--app/assets/javascripts/branches/divergence_graph.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/branches/divergence_graph.js b/app/assets/javascripts/branches/divergence_graph.js
index 66e8d982113..b88c056b00f 100644
--- a/app/assets/javascripts/branches/divergence_graph.js
+++ b/app/assets/javascripts/branches/divergence_graph.js
@@ -1,5 +1,5 @@
import Vue from 'vue';
-import { deprecatedCreateFlash as createFlash } from '../flash';
+import createFlash from '../flash';
import axios from '../lib/utils/axios_utils';
import { __ } from '../locale';
import DivergenceGraph from './components/divergence_graph.vue';
@@ -51,6 +51,8 @@ export default (endpoint, defaultBranch) => {
});
})
.catch(() =>
- createFlash(__('Error fetching diverging counts for branches. Please try again.')),
+ createFlash({
+ message: __('Error fetching diverging counts for branches. Please try again.'),
+ }),
);
};