From 928f57073ed8800ff7745bc96162dac9672a6769 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Wed, 25 Jun 2025 05:36:13 +0000 Subject: Ensures that @Redmine::PluginLoader.load@ is executed before @Doorkeeper.configure@ in order to properly load plugin permissions (#24808). git-svn-id: https://svn.redmine.org/redmine/trunk@23846 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/initializers/30-redmine.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config/initializers/30-redmine.rb b/config/initializers/30-redmine.rb index d6477faca..16bcebec4 100644 --- a/config/initializers/30-redmine.rb +++ b/config/initializers/30-redmine.rb @@ -10,7 +10,17 @@ Rails.application.config.to_prepare do ActiveSupport::XmlMini.backend = 'Nokogiri' Redmine::Preparation.prepare +end + +# Load the secret token from the Redmine configuration file +secret = Redmine::Configuration['secret_token'] +if secret.present? + RedmineApp::Application.config.secret_token = secret +end +Redmine::PluginLoader.load + +Rails.application.config.to_prepare do Doorkeeper.configure do orm :active_record @@ -76,17 +86,7 @@ Rails.application.config.to_prepare do Doorkeeper::AuthorizationsController.layout "base" Doorkeeper::AuthorizedApplicationsController.layout "base" Doorkeeper::AuthorizedApplicationsController.main_menu = false -end - -# Load the secret token from the Redmine configuration file -secret = Redmine::Configuration['secret_token'] -if secret.present? - RedmineApp::Application.config.secret_token = secret -end -Redmine::PluginLoader.load - -Rails.application.config.to_prepare do default_paths = [] default_paths << Rails.root.join("app/assets/javascripts") default_paths << Rails.root.join("app/assets/images") -- cgit v1.2.3