diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-02-12 15:45:45 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-02-12 15:45:45 -0200 |
| commit | c63f58d0f19220df44f0ddc553030be58309809c (patch) | |
| tree | 840099bfe15ba866de01e40f920b41b4570a2df9 | |
| parent | f7aa4c92a0a0dd609b6e07a5db256c417d0aa235 (diff) | |
| parent | 33e202d3ae8dfa3aa978a09944030622832e6e15 (diff) | |
| download | rails-c63f58d0f19220df44f0ddc553030be58309809c.tar.gz rails-c63f58d0f19220df44f0ddc553030be58309809c.tar.bz2 rails-c63f58d0f19220df44f0ddc553030be58309809c.zip | |
Merge pull request #23639 from Gaurav2728/update_change_log_entry_action_pack
use rails instead of rake [ci skip]
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activerecord/CHANGELOG.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 921aff300f..77aa4c01ba 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -42,10 +42,10 @@ ## Rails 5.0.0.beta2 (February 01, 2016) ## -* Add `-g` and `-c` options to `bin/rake routes`. These options return the url `name`, `verb` and +* Add `-g` and `-c` options to `bin/rails routes`. These options return the url `name`, `verb` and `path` field that match the pattern or match a specific controller. - Deprecate `CONTROLLER` env variable in `bin/rake routes`. + Deprecate `CONTROLLER` env variable in `bin/rails routes`. See #18902. diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index ab17a2b438..45c123d943 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -620,7 +620,7 @@ *Ben Murphy*, *Matthew Draper* -* `bin/rake db:migrate` uses +* `bin/rails db:migrate` uses `ActiveRecord::Tasks::DatabaseTasks.migrations_paths` instead of `Migrator.migrations_paths`. |