comparison config/initializers/30-redmine.rb @ 1526:404aa68d4227

Merge from live branch
author Chris Cannam
date Thu, 11 Sep 2014 12:46:20 +0100
parents 261b3d9a4903
children
comparison
equal deleted inserted replaced
1493:a5f2bdf3b486 1526:404aa68d4227
7 secret = Redmine::Configuration['secret_token'] 7 secret = Redmine::Configuration['secret_token']
8 if secret.present? 8 if secret.present?
9 RedmineApp::Application.config.secret_token = secret 9 RedmineApp::Application.config.secret_token = secret
10 end 10 end
11 11
12 if Object.const_defined?(:OpenIdAuthentication)
13 openid_authentication_store = Redmine::Configuration['openid_authentication_store']
14 OpenIdAuthentication.store =
15 openid_authentication_store.present? ?
16 openid_authentication_store : :memory
17 end
18
12 Redmine::Plugin.load 19 Redmine::Plugin.load
13 unless Redmine::Configuration['mirror_plugins_assets_on_startup'] == false 20 unless Redmine::Configuration['mirror_plugins_assets_on_startup'] == false
14 Redmine::Plugin.mirror_assets 21 Redmine::Plugin.mirror_assets
15 end 22 end