diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:38:53 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-08-17 21:46:39 +0530 |
| commit | ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 (patch) | |
| tree | d5450558358174f6963323061e25366246ff5801 /activerecord/lib | |
| parent | dba4c6fe539c24ec1beb106e34f37f3cd0632022 (diff) | |
| download | rails-ec8ef1e1055c4e1598da13f49d30261f07f4a9b4.tar.gz rails-ec8ef1e1055c4e1598da13f49d30261f07f4a9b4.tar.bz2 rails-ec8ef1e1055c4e1598da13f49d30261f07f4a9b4.zip | |
Revert "Merge branch 'master' of github.com:rails/docrails"
This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing
changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9.
Seems to be a code merge done by mistake.
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 90020c3510..33ee129fc6 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 'bin/rake db:migrate RAILS_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 |