rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix a wrong pull request reference [ci skip]	Robin Dupret	2017-03-04	1	-1/+1
*	Add a changelog entry for #28284 [ci skip]	Robin Dupret	2017-03-04	1	-0/+6
*	Merge pull request #25174 from kamipo-fix_db_migrate_status	Andrew White	2017-03-04	4	-24/+75
\|\
\| *	Fix `rake db:migrate:status` with subdirectories	Ryuta Kamizono	2017-03-04	4	-24/+75
\|/
*	Merge pull request #28283 from y-yagi/silence_puma_startup_messages_in_system...	Andrew White	2017-03-04	1	-1/+1
\|\
\| *	Silence puma startup messages in system test	yuuji.yaginuma	2017-03-04	1	-1/+1
* \|	[ci skip] Add CHANGELOG entry for #28282	Andrew White	2017-03-04	1	-0/+10
* \|	Merge pull request #28282 from kamipo/dont_share_options_with_with_reference_...	Andrew White	2017-03-04	2	-7/+10
\|\ \
\| * \|	Don't share `options` with a reference type column	Ryuta Kamizono	2017-03-04	2	-7/+10
* \| \|	Merge pull request #28284 from y-yagi/fix_system_test_example	Robin Dupret	2017-03-04	1	-7/+9
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fx system test example [ci skip]	yuuji.yaginuma	2017-03-04	1	-7/+9
\| \|/
* \|	Escapes and edits to configuring guide [ci skip] (#28280)	Vipul A M	2017-03-04	1	-5/+5
* \|	A private method can't be called with `self.`	Akira Matsuda	2017-03-04	1	-2/+2
* \|	Merge pull request #28265 from 0oneo/association_guide	Ryuta Kamizono	2017-03-04	1	-1/+1
\|\ \
\| * \|	passing unique parameter to belongs_to wrongly	0oneo	2017-03-03	1	-1/+1
* \| \|	Merge pull request #28276 from rails/pkwip	Aaron Patterson	2017-03-03	3	-46/+78
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	remove unused parameters	Aaron Patterson	2017-03-03	1	-6/+6
\| * \|	`join_keys` no longer needs a class passed to it	Aaron Patterson	2017-03-03	3	-30/+33
\| * \|	refactor so there is only one JoinKeys factory method	Aaron Patterson	2017-03-03	1	-4/+15
\| * \|	ask reflection for klass join reflection	Aaron Patterson	2017-03-03	2	-13/+16
\| * \|	Move join scopes on to the reflection object	Aaron Patterson	2017-03-03	2	-8/+23
* \| \|	Merge pull request #28272 from rails/add-iso8601-and-rfc3339-parsing	Andrew White	2017-03-03	8	-0/+398
\|\ \ \
\| * \| \|	Add `rfc3339` aliases to `xmlschema`	Andrew White	2017-03-03	5	-0/+25
\| * \| \|	Add `Time.rfc3339` parsing method	Andrew White	2017-03-03	3	-0/+62
\| * \| \|	Add `ActiveSupport::TimeZone.rfc3339` parsing method	Andrew White	2017-03-03	3	-0/+173
\| * \| \|	Add `ActiveSupport::TimeZone.iso8601` parsing method	Andrew White	2017-03-03	3	-0/+138
* \| \| \|	Merge pull request #28271 from dijonkitchen/patch-2	Robin Dupret	2017-03-03	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix spelling	Jonathan Chen	2017-03-03	1	-1/+1
\|/ / /
* / /	Remove unnecessary system test code	eileencodes	2017-03-03	1	-13/+0
\|/ /
* \|	Merge pull request #28267 from rails/rm-node-from-constraints	Aaron Patterson	2017-03-03	2	-3/+3
\|\ \ \| \|/ \|/\|
\| *	Remove `node` parameter to `join_constraints`	Aaron Patterson	2017-03-03	2	-3/+3
\|/
*	Fix typo in comment	Andrew White	2017-03-03	1	-1/+1
*	Merge pull request #28223 from mtsmfm/fix-random-fail-on-system-test-with-ajax	Eileen M. Uchitelle	2017-03-03	2	-1/+29
\|\
\| *	Fix random failure on system test with ajax	Fumiaki MATSUSHIMA	2017-03-03	2	-1/+29
* \|	Merge pull request #28204 from rails/deprecate-implicit-coercion-of-durations	Andrew White	2017-03-03	6	-8/+149
\|\ \ \| \|/ \|/\|
\| *	Deprecate implicit coercion of `ActiveSupport::Duration`	Andrew White	2017-03-02	6	-8/+149
* \|	Merge pull request #28260 from Erol/fix-upgrading-rails-guide-typo	Arun Agrawal	2017-03-03	1	-1/+1
\|\ \
\| * \|	Fix typo in Upgrading Ruby on Rails Guide [skip ci]	Erol Fornoles	2017-03-03	1	-1/+1
\|/ /
* \|	Merge pull request #28255 from acrich/master	Ryuta Kamizono	2017-03-03	1	-1/+1
\|\ \
\| * \|	fixed suspected typo in sample sql query	Shay	2017-03-02	1	-1/+1
* \| \|	[ci skip] Add changelog entry for #28139.	Kasper Timm Hansen	2017-03-02	1	-0/+16
* \| \|	Inline CIPHER constant.	Kasper Timm Hansen	2017-03-02	1	-6/+3
* \| \|	Move key packing into encryptor.	Kasper Timm Hansen	2017-03-02	2	-6/+4
* \| \|	Add back yaml require.	Kasper Timm Hansen	2017-03-02	1	-0/+1
* \| \|	Merge pull request #28139 from stouset/update-secrets-to-use-modern-crypto	Kasper Timm Hansen	2017-03-02	2	-17/+16
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Default Secrets to AES-128-GCM, using ActiveSupport::MessageEncryptor	Stephen Touset	2017-03-01	2	-17/+16
* \| \|	Merge pull request #28245 from y-yagi/use_blank_instead_of_empty	Kasper Timm Hansen	2017-03-02	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Convert `ENV["EDITOR"]` to string before check	yuuji.yaginuma	2017-03-02	1	-1/+1
* \| \|	Merge pull request #28242 from rails/add-fractional-support-to-datetime-change	Andrew White	2017-03-02	4	-17/+46
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Update `DateTime#change` to support usec and nsec	Andrew White	2017-03-02	4	-17/+46