1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/activerecord/lib
Aaron Patterson aa8ade5811 Merge branch 'master' into mdluo-master
* master:
  Move required error message and changelog to Active Record
  Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846
  Use Module#include instead of send :include, since now is a public method [ci skip]
  ✂️ warning from controller renderer test

Conflicts:
	activerecord/CHANGELOG.md
2015-02-01 08:42:22 -08:00
..
active_record Merge branch 'master' into mdluo-master 2015-02-01 08:42:22 -08:00
rails/generators Add Secure Token Generator 2015-01-11 14:42:54 -05:00
active_record.rb Add has_secure_token to Active Record 2015-01-04 11:31:37 -05:00