Add Gemfile.plugins

pull/6827/head
Oliver Günther 7 years ago
parent 86df8efcea
commit 6883723b4f
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 7
      Gemfile.plugins
  2. 2
      lib/open_project/two_factor_authentication/token_strategy_manager.rb

@ -0,0 +1,7 @@
# Used by travis to bundle this plugin with the OpenProject core.
# The tested plugin will be moved to the path `./plugins/this`
# whereas OpenProject will be checked out to `.`.
gem 'openproject-two_factor_authentication', path: 'plugins/this'
# If the plugin has any dependencies declare them here:

@ -85,7 +85,7 @@ module OpenProject::TwoFactorAuthentication
# 2FA Plugin configuration
def configuration
config = OpenProject::Configuration['2fa'] || {}
settings = Setting.plugin_openproject_two_factor_authentication
settings = Setting.plugin_openproject_two_factor_authentication || {}
# Allow enforcing from settings if not true in configuration
config[:enforced] ||= settings[:enforced]

Loading…
Cancel
Save