5 commits

Author	SHA1	Message	Date
Kir Shatrov	831be98f9a	Use frozen-string-literal in ActiveRecord	2017-07-19 22:27:07 +03:00
Matthew Draper	87b3e226d6	Revert "Merge pull request #29540 from kirs/rubocop-frozen-string" ... This reverts commit 3420a14590, reversing changes made to afb66a5a59.	2017-07-02 02:15:17 +09:30
Kir Shatrov	cfade1ec7e	Enforce frozen string in Rubocop	2017-07-01 02:11:03 +03:00
Lauro Caetano	db5d26c9d7	Fix error when using with_options with lambda. ... It was causing error when using `with_options` passing a lambda as its last argument. class User < ActiveRecord::Base with_options dependent: :destroy do |assoc| assoc.has_many :profiles, -> { where(active: true) } end end It was happening because the `option_merger` was taking the last argument and checking if it was a Hash. This breaks the HasMany usage, because its last argument can be a Hash or a Proc. As the behavior described in this test: https://github.com/rails/rails/blob/master/activesupport/test/option_merger_test.rb#L69 the method will only accept the lambda, this way it will keep the expected behavior. See 9eaa0a34	2014-04-03 10:26:37 -03:00
Edward Faulkner	909588d964	Fixing ordering of HABTM association deletion [#6191 state:resolved] ... Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>	2011-02-04 19:39:59 -02:00