aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-04-19 23:56:11 -0400
committerGitHub <noreply@github.com>2018-04-19 23:56:11 -0400
commitbfd61cbadbeac2002d1bf9bdf4320ac3ad3983f5 (patch)
treef3b6003318d9356ec95772c42b6ca9d001e7fcf0 /activerecord/lib
parent3812ef8b664888a5ea728bc2a572074c5d9e546c (diff)
parentf8cbc1dd6e186f9e077d101653f5b56deb740503 (diff)
downloadrails-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
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/log_subscriber.rb2
1 files changed, 1 insertions, 1 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) ||