diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-02 22:17:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 22:17:29 +0200 |
| commit | 5c5317041f17375666bfaf4788f0adf71804b47d (patch) | |
| tree | 4dfa61cff64d1f2477bcbf914e16b25fd2953386 /lib | |
| parent | a192b193bdf7013df09c6cd63916274cd9d47cf7 (diff) | |
| parent | b367dd713e5b97d79d52e9cb67042eadb241d032 (diff) | |
Merge pull request #1310 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/media_cli.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index b4ad78fe5..08a8f1093 100644 --- a/lib/mastodon/media_cli.rb +++ b/lib/mastodon/media_cli.rb @@ -115,7 +115,7 @@ module Mastodon when :filesystem require 'find' - root_path = ENV.fetch('RAILS_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s) + root_path = ENV.fetch('PAPERCLIP_ROOT_PATH', File.join(':rails_root', 'public', 'system')).gsub(':rails_root', Rails.root.to_s) Find.find(File.join(*[root_path, prefix].compact)) do |path| next if File.directory?(path) |