Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-12 06:10:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-12 06:10:47 +0300
commit6965dc27dc7338316932271394fd49efaef1ea46 (patch)
treee3a916797cf37f9d739a0773c92557fc685b103f /app/helpers/users_helper.rb
parenta8f63f201972c5c1f66d7e3c4beb54803752a7ed (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/users_helper.rb')
-rw-r--r--app/helpers/users_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index a58f8a6f792..a5d4d6872df 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -3,7 +3,7 @@
module UsersHelper
def admin_users_data_attributes(users)
{
- users: Admin::UserSerializer.new.represent(users).to_json,
+ users: Admin::UserSerializer.new.represent(users, { current_user: current_user }).to_json,
paths: admin_users_paths.to_json
}
end