github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-13 05:43:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: stop including GlobalPath in default context (#11323)

Browse Source 
We do not want these method names to clash, instead encapsulate the helpers
so we do not add methods to Kernel

Correct a but exposed by Ruby 2.7
This commit is contained in:
Sam 2020-11-23 12:59:45 +11:00 committed by Krzysztof Kotlarek
parent 8a143ebbf8
commit 27440ec561
No known key found for this signature in database
GPG Key ID: 48E9AFEDAEF8E8DB
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/tasks/assets.rake
View File

@ -36,11 +36,6 @@ task 'assets:precompile:before' do
require 'sprockets'
require 'digest/sha1'
# Needed for proper source maps with a CDN
load "#{Rails.root}/lib/global_path.rb"
include GlobalPath
end
task 'assets:precompile:css' => 'environment' do
@ -80,6 +75,20 @@ def assets_path
"#{Rails.root}/public/assets"
end
def global_path_klass
@global_path_klass ||= Class.new do
extend GlobalPath
end
end
def cdn_path(p)
global_path_klass.cdn_relative_path(p)
end
def cdn_relative_path(p)
global_path_klass.cdn_relative_path(p)
end
def compress_node(from, to)
to_path = "#{assets_path}/#{to}"
assets = cdn_relative_path("/assets")