From 7b6e6b9370719ef6f081230681fbcbb5828c14bd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 17 Jun 2017 10:40:51 +0000 Subject: [PATCH] Removes plugins_path from configuration file (#24007). git-svn-id: http://svn.redmine.org/redmine/trunk@16675 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- config/configuration.yml.example | 9 --------- lib/redmine/plugin.rb | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config/configuration.yml.example b/config/configuration.yml.example index 83232f30b..3522ef695 100644 --- a/config/configuration.yml.example +++ b/config/configuration.yml.example @@ -75,15 +75,6 @@ default: # attachments_storage_path: D:/redmine/files attachments_storage_path: - # Absolute path to the directory where plugins are stored. - # The default is the 'plugins' directory in your Redmine instance. - # Your Redmine instance needs to have read permission on this - # directory. - # Examples: - # plugins_path: /var/redmine/plugins - # plugins_path: D:/redmine/plugins - plugins_path: - # Configuration of the autologin cookie. # autologin_cookie_name: the name of the cookie (default: autologin) # autologin_cookie_path: the cookie path (default: /) diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb index 9ab364b3a..503c3db2c 100644 --- a/lib/redmine/plugin.rb +++ b/lib/redmine/plugin.rb @@ -44,7 +44,7 @@ module Redmine #:nodoc: # When rendered, the plugin settings value is available as the local variable +settings+ class Plugin cattr_accessor :directory - self.directory = Redmine::Configuration['plugins_path'] || File.join(Rails.root, 'plugins') + self.directory = File.join(Rails.root, 'plugins') cattr_accessor :public_directory self.public_directory = File.join(Rails.root, 'public', 'plugin_assets') -- 2.39.5