diff options
Diffstat (limited to 'app/controllers/concerns')
4 files changed, 10 insertions, 10 deletions
diff --git a/app/controllers/concerns/confirm_email_warning.rb b/app/controllers/concerns/confirm_email_warning.rb index 2efea461a35..c55911eed48 100644 --- a/app/controllers/concerns/confirm_email_warning.rb +++ b/app/controllers/concerns/confirm_email_warning.rb @@ -38,6 +38,6 @@ module ConfirmEmailWarning end def email_to_display - html_escape(email) + ERB::Util.html_escape(email) end end 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 diff --git a/app/controllers/concerns/integrations/params.rb b/app/controllers/concerns/integrations/params.rb index e344e0dcd8c..d71ab98c3fd 100644 --- a/app/controllers/concerns/integrations/params.rb +++ b/app/controllers/concerns/integrations/params.rb @@ -38,6 +38,9 @@ module Integrations :default_irc_uri, :device, :disable_diffs, + :diffblue_access_token_name, + :diffblue_access_token_secret, + :diffblue_license_key, :drone_url, :enable_ssl_verification, :external_wiki_url, diff --git a/app/controllers/concerns/preview_markdown.rb b/app/controllers/concerns/preview_markdown.rb index 7f1b961e92a..8bd120b5ed5 100644 --- a/app/controllers/concerns/preview_markdown.rb +++ b/app/controllers/concerns/preview_markdown.rb @@ -44,6 +44,7 @@ module PreviewMarkdown when 'groups' then { group: group, issuable_reference_expansion_enabled: true } when 'projects' then projects_filter_params when 'timeline_events' then timeline_events_filter_params + when 'organizations' then { pipeline: :description } else {} end.merge( requested_path: params[:path], |