Browse Source

Fix RuboCop offense Rails/RootPublicPath (#37248).


git-svn-id: https://svn.redmine.org/redmine/trunk@21633 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/5.1.0
Go MAEDA 1 year ago
parent
commit
637756eef7
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      lib/redmine/plugin_loader.rb
  2. 1
    1
      lib/redmine/wiki_formatting/common_mark/helper.rb

+ 1
- 1
lib/redmine/plugin_loader.rb View File

@@ -88,7 +88,7 @@ module Redmine

# Absolute path to the plublic directory where plugins assets are copied
cattr_accessor :public_directory
self.public_directory = Rails.root.join('public/plugin_assets')
self.public_directory = Rails.public_path.join('plugin_assets')

def self.create_assets_reloader
plugin_assets_dirs = {}

+ 1
- 1
lib/redmine/wiki_formatting/common_mark/helper.rb View File

@@ -26,7 +26,7 @@ module Redmine
help_file = "/help/#{current_language.to_s.downcase}/wiki_syntax_common_mark.html"
# fall back to the english help page if there is none for the current
# language
unless File.readable? Rails.root.join("public", help_file)
unless File.readable? Rails.public_path.join(help_file)
help_file = "/help/en/wiki_syntax_common_mark.html"
end
url = "#{Redmine::Utils.relative_url_root}#{help_file}"

Loading…
Cancel
Save