Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 9 deletions

diff --git a/app/controllers/concerns/enforces_two_factor_authentication.rb b/app/controllers/concerns/enforces_two_factor_authentication.rb
index 24475909b62..81130fcd6a6 100644
--- a/app/controllers/concerns/enforces_two_factor_authentication.rb
+++ b/app/controllers/concerns/enforces_two_factor_authentication.rb
@@ -46,15 +46,11 @@ module EnforcesTwoFactorAuthentication
   end
 
   # rubocop: disable CodeReuse/ActiveRecord
-  def two_factor_authentication_reason(global: -> {}, group: -> {})
-    if two_factor_authentication_required?
-      if Gitlab::CurrentSettings.require_two_factor_authentication?
-        global.call
-      else
-        groups = current_user.source_groups_of_two_factor_authentication_requirement.reorder(name: :asc)
-        group.call(groups)
-      end
-    end
+  def execute_action_for_2fa_reason(actions)
+    reason = two_factor_verifier.two_factor_authentication_reason
+    groups_enforcing_two_factor = current_user.source_groups_of_two_factor_authentication_requirement
+                                              .reorder(name: :asc)
+    actions[reason].call(groups_enforcing_two_factor)
   end
   # rubocop: enable CodeReuse/ActiveRecord