diff options
author | Arthur Nogueira Neves <arthurnn@gmail.com> | 2014-02-18 14:33:25 -0500 |
---|---|---|
committer | Arthur Nogueira Neves <arthurnn@gmail.com> | 2014-02-18 14:33:25 -0500 |
commit | 5dc6bf5fbcb70b330edff8da257607acd1760805 (patch) | |
tree | e020675579f6052cb35eb819fb8d325380b2da1b | |
parent | 33cb47ee488b2381d87f5bb36818cae5fa76c22e (diff) | |
parent | b74490e4f25ef26de3906cd5cd9ca0193e873372 (diff) | |
download | rails-5dc6bf5fbcb70b330edff8da257607acd1760805.tar.gz rails-5dc6bf5fbcb70b330edff8da257607acd1760805.tar.bz2 rails-5dc6bf5fbcb70b330edff8da257607acd1760805.zip |
Merge pull request #14098 from Amit-Thawait/master
Typo fix for unscope [ci skip]
-rw-r--r-- | activerecord/CHANGELOG.md | 2 | ||||
-rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 38206d727f..7efd75a239 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -46,7 +46,7 @@ class User < ActiveRecord::Base default_scope { where state: 'pending' } - scope :active, -> { unescope(where: :state).where(state: 'active') } + scope :active, -> { unscope(where: :state).where(state: 'active') } scope :inactive, -> { rewhere state: 'inactive' } end diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index a8b7c9d492..af3580a85b 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -315,7 +315,7 @@ To get the previous behavior it is needed to explicitly remove the ```ruby class User < ActiveRecord::Base default_scope { where state: 'pending' } - scope :active, -> { unescope(where: :state).where(state: 'active') } + scope :active, -> { unscope(where: :state).where(state: 'active') } scope :inactive, -> { rewhere state: 'inactive' } end |