diff --git a/CHANGELOG.md b/CHANGELOG.md index d5261bd..489325e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -200,7 +200,7 @@ ignored when block parameter is specified. PR [#818](https://github.com/activerecord-hackery/ransack/pull/818). -* No need pass some arugments to JoinAssociation#join_constraints in Rails 5.1. +* No need pass some arguments to JoinAssociation#join_constraints in Rails 5.1. PR [#814](https://github.com/activerecord-hackery/ransack/pull/814). Fixes [#807](https://github.com/activerecord-hackery/ransack/issues/807). Reference [rails/rails#28267](https://github.com/rails/rails/pull/28267) diff --git a/README.md b/README.md index 6930c51..06fa4bb 100644 --- a/README.md +++ b/README.md @@ -282,7 +282,7 @@ See this feature: https://www.postgresql.org/docs/13/queries-order.html #### Case Insensitive Sorting in PostgreSQL -In order to request PostgresSQL to do a case insensitive sort for all string columns of a model at once, Ransack can be extended by using this approach: +In order to request PostgreSQL to do a case insensitive sort for all string columns of a model at once, Ransack can be extended by using this approach: ```ruby module RansackObject diff --git a/lib/ransack/adapters/active_record/base.rb b/lib/ransack/adapters/active_record/base.rb index 9ad348a..1cfa5a1 100644 --- a/lib/ransack/adapters/active_record/base.rb +++ b/lib/ransack/adapters/active_record/base.rb @@ -70,7 +70,7 @@ module Ransack end # ransack_scope_skip_sanitize_args, by default, returns an empty array. - # i.e. use the sanitize_scope_args setting to determin if args should be converted. + # i.e. use the sanitize_scope_args setting to determine if args should be converted. # For overriding with a list of scopes which should be passed the args as-is. # def ransackable_scopes_skip_sanitize_args diff --git a/spec/polyamorous/join_association_spec.rb b/spec/polyamorous/join_association_spec.rb index b07db29..17335bd 100644 --- a/spec/polyamorous/join_association_spec.rb +++ b/spec/polyamorous/join_association_spec.rb @@ -17,7 +17,7 @@ module Polyamorous expect(subject).not_to eq new_join_association(reflection, parent.children, Article) end - it 'leaves the orginal reflection intact for thread safety' do + it 'leaves the original reflection intact for thread safety' do reflection.instance_variable_set(:@klass, Article) join_association .swapping_reflection_klass(reflection, Person) do |new_reflection|