Merge branch 'peterhegman/fix-unlock-user-success-alert' into 'master'

Fix the color of the unlock user success alert

See merge request gitlab-org/gitlab!68068

app/controllers/admin/users_controller.rb

@@ -148,7 +148,7 @@ class Admin::UsersController < Admin::ApplicationController
 
   def unlock
     if update_user { |user| user.unlock_access! }
-      redirect_back_or_admin_user(alert: _("Successfully unlocked"))
+      redirect_back_or_admin_user(notice: _("Successfully unlocked"))
     else
       redirect_back_or_admin_user(alert: _("Error occurred. User was not unlocked"))
     end

spec/controllers/admin/users_controller_spec.rb

@@ -416,6 +416,7 @@ RSpec.describe Admin::UsersController do
       put :unlock, params: { id: user.username }
       user.reload
       expect(user.access_locked?).to be_falsey
+      expect(flash[:notice]).to eq _('Successfully unlocked')
     end
   end