diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-04-19 23:56:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 23:56:11 -0400 |
| commit | bfd61cbadbeac2002d1bf9bdf4320ac3ad3983f5 (patch) | |
| tree | f3b6003318d9356ec95772c42b6ca9d001e7fcf0 | |
| parent | 3812ef8b664888a5ea728bc2a572074c5d9e546c (diff) | |
| parent | f8cbc1dd6e186f9e077d101653f5b56deb740503 (diff) | |
| download | rails-bfd61cbadbeac2002d1bf9bdf4320ac3ad3983f5.tar.gz rails-bfd61cbadbeac2002d1bf9bdf4320ac3ad3983f5.tar.bz2 rails-bfd61cbadbeac2002d1bf9bdf4320ac3ad3983f5.zip | |
Merge pull request #32650 from bogdanvlviv/return_back_slash_and_use___dir__
Return back "/" to the end of RAILS_GEM_ROOT
| -rw-r--r-- | activerecord/lib/active_record/log_subscriber.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/deprecation/reporting.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb index 9234029c22..013c3765b2 100644 --- a/activerecord/lib/active_record/log_subscriber.rb +++ b/activerecord/lib/active_record/log_subscriber.rb @@ -125,7 +125,7 @@ module ActiveRecord ] end - RAILS_GEM_ROOT = File.expand_path("../../../..", __FILE__) + "/" + RAILS_GEM_ROOT = File.expand_path("../../..", __dir__) + "/" def ignored_callstack(path) path.start_with?(RAILS_GEM_ROOT) || diff --git a/activesupport/lib/active_support/deprecation/reporting.rb b/activesupport/lib/active_support/deprecation/reporting.rb index 2c004f4c9e..7075b5b869 100644 --- a/activesupport/lib/active_support/deprecation/reporting.rb +++ b/activesupport/lib/active_support/deprecation/reporting.rb @@ -104,7 +104,7 @@ module ActiveSupport end end - RAILS_GEM_ROOT = File.expand_path("../../../..", __dir__) + RAILS_GEM_ROOT = File.expand_path("../../../..", __dir__) + "/" def ignored_callstack(path) path.start_with?(RAILS_GEM_ROOT) || path.start_with?(RbConfig::CONFIG["rubylibdir"]) |