diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 00:45:09 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 00:45:09 -0300 |
| commit | 7c6861b0bc85077ed1f1dcb4a919de0f1b8d490d (patch) | |
| tree | 8f7319a922ff5124985f11e6908afdadbe32f8d1 /activerecord/lib | |
| parent | 8a1c3476a62005e3cb7cfe440da71b94fab8aa5b (diff) | |
| download | rails-7c6861b0bc85077ed1f1dcb4a919de0f1b8d490d.tar.gz rails-7c6861b0bc85077ed1f1dcb4a919de0f1b8d490d.tar.bz2 rails-7c6861b0bc85077ed1f1dcb4a919de0f1b8d490d.zip | |
Do not check only for the Rails constant
This constant may be define for auxiliar gems like rails-html-sanitizer
and these methods call will fail.
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 3cac465440..46f4794010 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -39,7 +39,7 @@ module ActiveRecord class PendingMigrationError < MigrationError#:nodoc: def initialize - if defined?(Rails) + if defined?(Rails.env) super("Migrations are pending. To resolve this issue, run:\n\n\tbin/rake db:migrate RAILS_ENV=#{::Rails.env}") else super("Migrations are pending. To resolve this issue, run:\n\n\tbin/rake db:migrate") |