diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-04-03 16:51:27 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-04-03 16:51:27 +0000 |
| commit | bdcacc856641b6d2956616e393926e02b422199e (patch) | |
| tree | 8fb0c5558f8ee1abc4c53ae9a52fd5cafbc3d5f4 /activerecord/lib/active_record | |
| parent | 78f188a2f8e0f2d8bdb1d9ae38acc1d47af17a9d (diff) | |
| parent | fc959d6efd9fbbe37fd4bf34abe08680f70d59fa (diff) | |
| download | rails-bdcacc856641b6d2956616e393926e02b422199e.tar.gz rails-bdcacc856641b6d2956616e393926e02b422199e.tar.bz2 rails-bdcacc856641b6d2956616e393926e02b422199e.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activerecord/lib/active_record')
| -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 245c05f3e0..a5c2985132 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -540,7 +540,7 @@ module ActiveRecord MigrationFilenameRegexp = /\A([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?\.rb\z/ # :nodoc: # This class is used to verify that all migrations have been run before - # loading a web page if config.active_record.migration_error is set to :page_load + # loading a web page if <tt>config.active_record.migration_error</tt> is set to :page_load class CheckPending def initialize(app) @app = app |