diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-21 15:31:15 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-21 15:31:15 -0800 |
commit | bc8d2f6a628dedeb091e4262a3a1b59d0749b1a6 (patch) | |
tree | 52d61165fac5f1c410b9918afa30289180833c48 /activerecord/lib | |
parent | 625699aa6c1122a0158f421e43aa8b1033586035 (diff) | |
parent | 6b692ee37c08f1abee8c9b8a12f9b7f1234afb00 (diff) | |
download | rails-bc8d2f6a628dedeb091e4262a3a1b59d0749b1a6.tar.gz rails-bc8d2f6a628dedeb091e4262a3a1b59d0749b1a6.tar.bz2 rails-bc8d2f6a628dedeb091e4262a3a1b59d0749b1a6.zip |
Merge pull request #8574 from alindeman/rails_env
Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is not set (e.g., in Pow)
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 806b367c6b..273af32237 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -32,7 +32,7 @@ module ActiveRecord class PendingMigrationError < ActiveRecordError#:nodoc: def initialize - super("Migrations are pending; run 'rake db:migrate RAILS_ENV=#{ENV['RAILS_ENV']}' to resolve this issue.") + super("Migrations are pending; run 'rake db:migrate RAILS_ENV=#{Rails.env}' to resolve this issue.") end end |