Make plugin Redmine 5 compatible

Contargo · Mar 25, 2024 · 775f575 · 775f575
1 parent 652a429
commit 775f575
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 gem 'openid_connect', '~> 2.2'
-gem 'redis', '~> 4.2'
+gem 'redis', '~> 5.0'
 gem 'hiredis', '~> 0.6.3'
diff --git a/lib/redmine_oidc.rb b/lib/redmine_oidc.rb
@@ -15,12 +15,16 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-Rails.configuration.to_prepare do
-  require_dependency 'redmine_oidc/account_controller_patch'
-  require_dependency 'redmine_oidc/application_controller_patch'
-  require_dependency 'redmine_oidc/avatars_helper_patch'
-  require_dependency 'redmine_oidc/hooks'
-end
+REDMINE_OIDC_REQUIRED_FILES = [
+  'redmine_oidc/account_controller_patch',
+  'redmine_oidc/application_controller_patch',
+  'redmine_oidc/avatars_helper_patch',
+  'redmine_oidc/hooks'
+]
+
+base_url = File.dirname(__FILE__)
+REDMINE_OIDC_REQUIRED_FILES.each { |file| require(base_url + '/' + file) }
+
 
 module RedmineOidc
   def self.settings