summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/admin.js
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-12-11 18:56:53 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-12-11 18:56:53 +0000
commitfcd44484cd427fc75f05e1c8363e9def4b4bf64f (patch)
treee3181efad22ad409ef98a89592c1911d43f7bdad /app/assets/javascripts/admin.js
parent7c68be16a6d364cd40d9fbb6e0878b9f2947bb88 (diff)
parent4ccbd556d98e002b1c521fd3dd7748fe1d9c4044 (diff)
downloadgitlab-ce-28869-es6-modules.tar.gz
Merge branch 'master' into 28869-es6-modules28869-es6-modules
* master: (117 commits) small change to make less conflict with EE version Add cop for use of remove_column Resolve merge conflicts with dev.gitlab.org/master after security release add index for doc/administration/operations/ Remove RubySampler#sample_objects for performance as well Bugfix: User can't change the access level of an access requester Add spec for removing issues.assignee_id updated imports Keep track of storage check timings Remove a header level in the new 'Automatic CE->EE merge' doc Improve down step of removing issues.assignee_id column Fix specs after removing assignee_id field Remove issues.assignee_id column Resolve conflicts in app/models/user.rb Fix image view mode Do not raise when downstream pipeline is created Remove the need for destroy and add a comment in the spec Use build instead of create in importer spec Simplify normalizing of paths Remove allocation tracking code from InfluxDB sampler for performance ...
Diffstat (limited to 'app/assets/javascripts/admin.js')
-rw-r--r--app/assets/javascripts/admin.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index 34669dd13d6..b0b72c40f25 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -1,4 +1,5 @@
/* eslint-disable func-names, space-before-function-paren, wrap-iife, one-var, no-var, one-var-declaration-per-line, no-unused-vars, no-else-return, prefer-arrow-callback, camelcase, quotes, comma-dangle, max-len */
+import { refreshCurrentPage } from './lib/utils/url_utility';
window.Admin = (function() {
function Admin() {
@@ -40,10 +41,10 @@ window.Admin = (function() {
return $('.change-owner-link').show();
});
$('li.project_member').bind('ajax:success', function() {
- return gl.utils.refreshCurrentPage();
+ return refreshCurrentPage();
});
$('li.group_member').bind('ajax:success', function() {
- return gl.utils.refreshCurrentPage();
+ return refreshCurrentPage();
});
showBlacklistType = function() {
if ($("input[name='blacklist_type']:checked").val() === 'file') {