diff options
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 8 | ||||
| -rw-r--r-- | guides/source/active_record_querying.md | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 15b7aeb639..e6640a116b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -283,7 +283,7 @@ GEM redis (~> 3.3) resque (~> 1.26) rufus-scheduler (~> 3.2) - rubocop (0.49.0) + rubocop (0.49.1) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 1cf4d30898..fd07187e15 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,11 +1,11 @@ * Add default option to class_attribute. Before: - class_attribute :settings - self.settings = {} + class_attribute :settings + self.settings = {} Now: - class_attribute :settings, default: {} + class_attribute :settings, default: {} *DHH* @@ -15,7 +15,7 @@ * Add `ActiveSupport::CurrentAttributes` to provide a thread-isolated attributes singleton. Primary use case is keeping all the per-request attributes easily available to the whole system. - + *DHH* * Fix implicit coercion calculations with scalars and durations diff --git a/guides/source/active_record_querying.md b/guides/source/active_record_querying.md index aea7515974..3676462788 100644 --- a/guides/source/active_record_querying.md +++ b/guides/source/active_record_querying.md @@ -559,8 +559,8 @@ SELECT * FROM clients WHERE (clients.locked != 1) ### OR Conditions -`OR` condition between two relations can be build by calling `or` on the first relation -and passing the second one as an argument. +`OR` conditions between two relations can be built by calling `or` on the first +relation, and passing the second one as an argument. ```ruby Client.where(locked: true).or(Client.where(orders_count: [1,3,5])) |