From 6883723b4f53d257776b7b6ee123440673e7fe7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Wed, 27 Dec 2017 18:06:13 +0100 Subject: [PATCH] Add Gemfile.plugins --- Gemfile.plugins | 7 +++++++ .../two_factor_authentication/token_strategy_manager.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Gemfile.plugins diff --git a/Gemfile.plugins b/Gemfile.plugins new file mode 100644 index 0000000000..d3edbb6aae --- /dev/null +++ b/Gemfile.plugins @@ -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: diff --git a/lib/open_project/two_factor_authentication/token_strategy_manager.rb b/lib/open_project/two_factor_authentication/token_strategy_manager.rb index 308c84cd07..b221f18cba 100644 --- a/lib/open_project/two_factor_authentication/token_strategy_manager.rb +++ b/lib/open_project/two_factor_authentication/token_strategy_manager.rb @@ -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]