Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 4 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 4f345fdeb9c..d66942c2884 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -3,8 +3,8 @@
 module UsersHelper
   def admin_users_data_attributes(users)
     {
-      users: Admin::UserSerializer.new.represent(users, { current_user: current_user }).to_json,
-      paths: admin_users_paths.to_json
+      users: Gitlab::Json.dump(Admin::UserSerializer.new.represent(users, { current_user: current_user })),
+      paths: Gitlab::Json.dump(admin_users_paths)
     }
   end
 
@@ -163,8 +163,8 @@ module UsersHelper
 
   def admin_user_actions_data_attributes(user)
     {
-      user: Admin::UserEntity.represent(user, { current_user: current_user }).to_json,
-      paths: admin_users_paths.to_json
+      user: Gitlab::Json.dump(Admin::UserEntity.represent(user, { current_user: current_user })),
+      paths: Gitlab::Json.dump(admin_users_paths)
     }
   end