diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 21:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 21:08:51 +0300 |
commit | ec18750aa8538712b952b8265581fc3b3e037923 (patch) | |
tree | 7eaf59fe40401415fde3c994bffae0031e2ffd23 /app/assets/javascripts/projects | |
parent | 61265b9f01c7db3d4f6e1266d165b1c85be7b9e7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/projects')
-rw-r--r-- | app/assets/javascripts/projects/settings/access_dropdown.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js index c189e617105..3ca5bca4bf2 100644 --- a/app/assets/javascripts/projects/settings/access_dropdown.js +++ b/app/assets/javascripts/projects/settings/access_dropdown.js @@ -1,7 +1,7 @@ /* eslint-disable no-underscore-dangle, class-methods-use-this */ import { escape, find, countBy } from 'lodash'; import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as Flash } from '~/flash'; +import createFlash from '~/flash'; import { n__, s__, __, sprintf } from '~/locale'; import { LEVEL_TYPES, LEVEL_ID_PROP, ACCESS_LEVELS, ACCESS_LEVEL_NONE } from './constants'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; @@ -328,15 +328,15 @@ export default class AccessDropdown { }) .catch(() => { if (this.deployKeysOnProtectedBranchesEnabled) { - Flash(__('Failed to load groups, users and deploy keys.')); + createFlash({ message: __('Failed to load groups, users and deploy keys.') }); } else { - Flash(__('Failed to load groups & users.')); + createFlash({ message: __('Failed to load groups & users.') }); } }); } else { this.getDeployKeys(query) .then(deployKeysResponse => callback(this.consolidateData(deployKeysResponse.data))) - .catch(() => Flash(__('Failed to load deploy keys.'))); + .catch(() => createFlash({ message: __('Failed to load deploy keys.') })); } } |