Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 1 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index d126981fb27..6679b6224ed 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -129,7 +129,7 @@ module UsersHelper
     }
   end
 
-  def unblock_user_modal_data(user)
+  def user_unblock_data(user)
     {
       path: unblock_admin_user_path(user),
       method: 'put',
@@ -168,6 +168,19 @@ module UsersHelper
     }
   end
 
+  def user_activation_data(user)
+    {
+      path: activate_admin_user_path(user),
+      method: 'put',
+      modal_attributes: {
+        title: s_('AdminUsers|Activate user %{username}?') % { username: sanitize_name(user.name) },
+        message: s_('AdminUsers|You can always deactivate their account again if needed.'),
+        okVariant: 'info',
+        okTitle: s_('AdminUsers|Activate')
+      }.to_json
+    }
+  end
+
   def user_deactivation_effects
     header = tag.p s_('AdminUsers|Deactivating a user has the following effects:')