Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c67f6309
Commit
c67f6309
authored
Oct 05, 2020
by
Etienne Baqué
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed deprecated Flash from AccessDropdown
parent
7c906a06
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/projects/settings/access_dropdown.js
app/assets/javascripts/projects/settings/access_dropdown.js
+4
-4
No files found.
app/assets/javascripts/projects/settings/access_dropdown.js
View file @
c67f6309
/* 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.
'
)
}
));
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment