diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-28 12:09:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-28 12:09:28 +0300 |
commit | f3cfb235c76426ce5a18003bb80ba625097bf1d0 (patch) | |
tree | 01705538824afb4ef6651d3e013c9e2411c08891 /app/assets/javascripts/protected_branches | |
parent | f8184e504b8aa6f77b42583a9fd08daebbdcc8ab (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/protected_branches')
-rw-r--r-- | app/assets/javascripts/protected_branches/protected_branch_create.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/protected_branches/protected_branch_edit.js | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/protected_branches/protected_branch_create.js b/app/assets/javascripts/protected_branches/protected_branch_create.js index 16eb5c3de32..f232cb2709a 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_create.js +++ b/app/assets/javascripts/protected_branches/protected_branch_create.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import CreateItemDropdown from '~/create_item_dropdown'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import AccessorUtilities from '~/lib/utils/accessor'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; @@ -130,7 +130,7 @@ export default class ProtectedBranchCreate { window.location.reload(); }) .catch(() => - createFlash({ + createAlert({ message: __('Failed to protect the branch'), }), ); diff --git a/app/assets/javascripts/protected_branches/protected_branch_edit.js b/app/assets/javascripts/protected_branches/protected_branch_edit.js index 15e706e38c6..1693d869b54 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_edit.js +++ b/app/assets/javascripts/protected_branches/protected_branch_edit.js @@ -1,5 +1,5 @@ import { find } from 'lodash'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import AccessDropdown from '~/projects/settings/access_dropdown'; @@ -74,7 +74,7 @@ export default class ProtectedBranchEdit { }) .then(callback) .catch(() => { - createFlash({ message: __('Failed to update branch!') }); + createAlert({ message: __('Failed to update branch!') }); }); } @@ -141,7 +141,7 @@ export default class ProtectedBranchEdit { .catch(() => { this.$allowedToMergeDropdown.enable(); this.$allowedToPushDropdown.enable(); - createFlash({ message: __('Failed to update branch!') }); + createAlert({ message: __('Failed to update branch!') }); }); } |