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

	Commit message (Expand)	Author	Age	Files	Lines
*	Clarify that config.eager_load controls eager loading [ci skip]	Eugene Kenny	2017-12-30	3	-8/+8
*	Fix `cache_key` with a relation having distinct and order	Ryuta Kamizono	2017-12-30	2	-2/+8
*	Remove needless blank lines [ci skip]	Ryuta Kamizono	2017-12-30	1	-2/+0
*	Merge pull request #31578 from Aquaj/feature/allow-callables-in-select-group-...	George Claghorn	2017-12-29	3	-4/+34
\|\
\| *	Allow the use of callable objects as group methods for grouped selects.	Jérémie Bonal	2017-12-27	3	-4/+34
* \|	Tweak headings [ci skip]	George Claghorn	2017-12-29	1	-16/+16
* \|	Merge pull request #31591 from nobu/patch-2	Yuji Yaginuma	2017-12-30	1	-8/+1
\|\ \
\| * \|	let drb make temprary server	Nobuyoshi Nakada	2017-12-29	1	-8/+1
* \| \|	Use released `delayed_job` instead of master version	yuuji.yaginuma	2017-12-30	2	-9/+4
\|/ /
* \|	Fix `cache_key` with a relation having custom select and order	Ryuta Kamizono	2017-12-29	2	-2/+7
* \|	Demonstrate providing keyfile data in lieu of a path [ci skip]	George Claghorn	2017-12-28	1	-24/+33
* \|	Link to the client gems [ci skip]	George Claghorn	2017-12-28	1	-3/+4
* \|	Merge pull request #31574 from Fudoshiki/patch-1	Guillermo Iguaran	2017-12-28	1	-0/+5
\|\ \
\| * \|	Fix IE 10 and IE 11's broken `preventDefault`	Yuri S	2017-12-27	1	-0/+5
* \| \|	Remove unused methods	yuuji.yaginuma	2017-12-28	1	-16/+0
\|/ /
* \|	Merge pull request #31568 from bogdanvlviv/update-action_view_overview-guide	Ryuta Kamizono	2017-12-27	1	-6/+8
\|\ \
\| * \|	Update "Action View Overview" guide [ci skip]	bogdanvlviv	2017-12-26	1	-6/+8
* \| \|	Merge pull request #31570 from y-yagi/ci_against_250	Matthew Draper	2017-12-27	1	-1/+8
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	CI against ruby 2.5.0	yuuji.yaginuma	2017-12-27	1	-1/+8
\|/ /
* \|	SQLite: Add more test cases for adding primary key	Ryuta Kamizono	2017-12-26	2	-58/+100
* \|	Make `sql_type` of primary key in SQLite to comparable with an integer (#28008)	Ryuta Kamizono	2017-12-26	2	-2/+2
* \|	Merge pull request #31562 from fatkodima/sqlite_migration_compatibility	Ryuta Kamizono	2017-12-26	2	-1/+20
\|\ \
\| * \|	Fix `add_column` with :primary_key type compatibility for SQLite	fatkodima	2017-12-25	2	-1/+20
* \| \|	Prevent to install gems when run test (#31564)	Yuji Yaginuma	2017-12-26	2	-4/+12
* \| \|	Merge pull request #31563 from Dorian/prevent-shadowing-outer-variables	Yuji Yaginuma	2017-12-26	1	-4/+4
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	prevent shadowing outer variables	Dorian Marié	2017-12-25	1	-4/+4
\|/ /
* \|	Don't pass `object_id` to `refute_nil` since `object_id` never to be nil	Ryuta Kamizono	2017-12-26	1	-6/+6
* \|	Merge pull request #31558 from hsbt/test-rubygems-2.7.4	Ryuta Kamizono	2017-12-25	1	-1/+1
\|\ \
\| * \|	To use rubygems-2.7.4 on Travis CI	SHIBATA Hiroshi	2017-12-25	1	-1/+1
\|/ /
* \|	Merge pull request #27780 from mikelikesbikes/fix-update-attribute-callbacks-...	Ryuta Kamizono	2017-12-25	4	-5/+15
\|\ \
\| * \|	save attributes changed by callbacks after update_attribute	Mike Busch	2017-12-22	3	-5/+11
* \| \|	Ensure to use repo's Gemfile in application	yuuji.yaginuma	2017-12-25	1	-0/+5
* \| \|	Move `test_skip_bundle` to `AppGeneratorTest`	yuuji.yaginuma	2017-12-24	2	-9/+9
* \| \|	Active Storage: Fix direct uploads in IE 11	Javan Makhmali	2017-12-23	2	-4/+18
* \| \|	Merge pull request #31545 from JanBussieck/add-hwia-inheritance-removal-to-5....	Ryuta Kamizono	2017-12-23	1	-0/+3
\|\ \ \
\| * \| \|	[docs] Add mention of removal of HWIA interface from `AC:Parameters`	Jan Bussieck	2017-12-22	1	-0/+3
* \| \| \|	Use `delayed_job` master	yuuji.yaginuma	2017-12-23	2	-4/+9
* \| \| \|	Merge pull request #31538 from yhirano55/add_cloud_service_links_to_readme_in...	Eileen M. Uchitelle	2017-12-22	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Add cloud service's links to README of Active Storage [ci skip]	Yoshiyuki Hirano	2017-12-22	1	-2/+2
* \| \| \| \|	Merge pull request #31544 from mrreynolds/activestorage-combined-minimagick-o...	Eileen M. Uchitelle	2017-12-22	2	-6/+30
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Add support for combined MiniMagick transformations	Robert Glaser	2017-12-22	2	-6/+30
* \| \| \| \|	Test that cache stores build unversioned keys	George Claghorn	2017-12-22	1	-0/+12
* \| \| \| \|	Revert "Remove code duplication in ActiveSupport::Cache"	George Claghorn	2017-12-22	1	-11/+26
\|/ / / /
* \| \| \|	Merge pull request #31543 from hsbt/update-bundler-1-16	Ryuta Kamizono	2017-12-22	7	-13/+1
\|\ \ \ \
\| * \| \| \|	Revert "Specify bundler version in template files"	SHIBATA Hiroshi	2017-12-22	6	-12/+0
\| * \| \| \|	Relax bundler version on Travis CI	SHIBATA Hiroshi	2017-12-22	1	-1/+1
\| \| \|/ / \| \|/\| \|
* / \| \|	Add test case for using sanitize method in the scope definition	Ryuta Kamizono	2017-12-22	1	-2/+10
\|/ / /
* \| \|	Merge pull request #31541 from hsbt/fix-travis-failure	Ryuta Kamizono	2017-12-22	1	-1/+1
\|\ \ \
\| * \| \|	Temporary disabled using rubygems 2.7.	SHIBATA Hiroshi	2017-12-22	1	-1/+1
\|/ / /
* \| \|	Merge pull request #31537 from yhirano55/pass_options_to_rails_blob_url	Rafael França	2017-12-21	1	-1/+1
\|\ \ \