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

	Commit message (Expand)	Author	Age	Files	Lines
*	Move join scopes on to the reflection object	Aaron Patterson	2017-03-03	2	-8/+23
*	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
* \| \|	Merge pull request #28220 from kamipo/valid_type_accept_only_supported_types	Rafael França	2017-03-01	5	-42/+10
\|\ \ \
\| * \| \|	`valid_type?` should accept only supported types	Ryuta Kamizono	2017-02-28	5	-42/+10
* \| \| \|	[ci skip] Add changelog entry for encrypted secrets.	Kasper Timm Hansen	2017-03-01	1	-0/+14
* \| \| \|	Put it to me straight: just say it.	Kasper Timm Hansen	2017-03-01	1	-3/+3
* \| \| \|	Tell users how to assign a $EDITOR.	Kasper Timm Hansen	2017-03-01	2	-0/+35
\| \|/ / \|/\| \|
* \| \|	Merge pull request #28239 from y-yagi/use_appropriate_type_for_test_framework...	Kasper Timm Hansen	2017-03-01	1	-1/+1
\|\ \ \
\| * \| \|	Use appropriate type for `test_framework` option	yuuji.yaginuma	2017-03-01	1	-1/+1
* \| \| \|	Merge pull request #28237 from lzap/default-cipher-dry	Kasper Timm Hansen	2017-03-01	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use DEFAULT_CIPHER constant in MessageEncryptor	Lukas Zapletal	2017-03-01	1	-1/+1
\|/ / / /
* \| \| \|	Whitelist adapters that support aliases in `HAVING` clause	Andrew White	2017-03-01	1	-1/+1
* \| \| \|	Merge pull request #28230 from y-yagi/HOST_to_be_in_uppercase	Rafael França	2017-02-28	1	-1/+1
\|\ \ \ \
\| * \| \| \|	`HOST` must be all capital letters	yuuji.yaginuma	2017-03-01	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #25296 from kamipo/use_inspect_for_type_cast_for_schema	Rafael França	2017-02-28	4	-9/+14
\|\ \ \ \
\| * \| \| \|	Use `inspect` in `type_cast_for_schema` for date/time and decimal values	Ryuta Kamizono	2016-12-11	4	-9/+14
* \| \| \| \|	Merge pull request #28120 from vfonic/plugin-generator-skip-turbolinks-dummy	Rafael França	2017-02-28	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Skip turbolinks for engine test application	Viktor Fonic	2017-02-28	1	-0/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #28210 from cefigueiredo/improve_required_test	Rafael França	2017-02-28	1	-7/+35
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Ensure that tests will reset belongs_to_requierd_by_default config	Carlos Figueiredo	2017-02-27	1	-23/+27
\| * \| \| \|	Make required by default test for belongs_to association clearer	Carlos Figueiredo	2017-02-27	1	-1/+25
* \| \| \| \|	Merge pull request #28217 from kamipo/create_join_table_respects_reference_ke...	Rafael França	2017-02-28	2	-8/+17
\|\ \ \ \ \
\| * \| \| \| \|	`create_join_table` should respect `references` column type	Ryuta Kamizono	2017-02-28	2	-8/+17
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #28063 from Erol/prioritize-callback-on-action-before-if	Rafael França	2017-02-28	2	-1/+41
\|\ \ \ \ \
\| * \| \| \| \|	Prioritize checking `:on` actions before `:if` for transaction callbacks	Erol Fornoles	2017-02-21	2	-1/+41
* \| \| \| \| \|	Revert "Dupping a CollectionProxy should dup the load_target"	eileencodes	2017-02-28	2	-12/+0
* \| \| \| \| \|	Merge pull request #28214 from kamipo/use_tables	Rafael França	2017-02-28	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use `tables` instead of `data_sources - views`	Ryuta Kamizono	2017-02-28	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #28215 from y-yagi/take_failed_screenshot_before_reset_driver	Rafael França	2017-02-28	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Take failed screenshot before reset driver	yuuji.yaginuma	2017-02-28	1	-1/+1