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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #25372 from kamipo/remove_assert_date_from_db	Sean Griffin	2016-06-13	2	-5/+1
\|\
\| *	Remove unnecessary `assert_date_from_db`	Ryuta Kamizono	2016-06-12	2	-5/+1
* \|	Add codeclimate and rubocop config files	Sean Griffin	2016-06-13	2	-0/+54
* \|	Merge pull request #25380 from gsamokovarov/drop-unused-blank-require	Kasper Timm Hansen	2016-06-13	1	-2/+0
\|\ \
\| * \|	Remove an unused require in ActiveSupport::TestCase	Genadi Samokovarov	2016-06-13	1	-2/+0
\|/ /
* \|	Merge pull request #25378 from nikhilthombare/patch-1	प्रथमेश Sonpatki	2016-06-12	1	-11/+11
\|\ \
\| * \|	Changed ActiveJob::Base to ApplicationJob in the Active Job guide [ci skip]	Nikhil Thombare	2016-06-13	1	-11/+11
\|/ /
* \|	Merge pull request #25362 from maclover7/jm-rm-ar-require	Eileen M. Uchitelle	2016-06-12	1	-2/+0
\|\ \
\| * \|	Remove unnecessary model requires	Jon Moss	2016-06-10	1	-2/+0
* \| \|	Merge pull request #25371 from kamipo/remove_outdated_comment	Eileen M. Uchitelle	2016-06-12	1	-12/+0
\|\ \ \
\| * \| \|	Remove outdated comments [ci skip]	Ryuta Kamizono	2016-06-12	1	-12/+0
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #25004 from y-yagi/generate_mailer_layout_files_if_it_does...	Eileen M. Uchitelle	2016-06-12	5	-0/+44
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	generate mailer layout files if it does not already exist	yuuji.yaginuma	2016-05-15	5	-0/+44
* \| \|	Merge pull request #25366 from prathamesh-sonpatki/update-release-notes-2	Rafael França	2016-06-11	1	-1/+19
\|\ \ \
\| * \| \|	Add missing things to Rails 5.0 release notes [ci skip]	Prathamesh Sonpatki	2016-06-11	1	-1/+19
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #25367 from stephenminded/active_job_test_helper_custom_qu...	Rafael França	2016-06-11	2	-1/+26
\|\ \ \
\| * \| \|	Provide the ability to override the queue adapter used by jobs under	Steve Lounsbury	2016-06-11	2	-1/+26
* \| \| \|	Merge pull request #25368 from frodsan/patch-1	Rafael França	2016-06-11	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix typo	Francesco Rodriguez	2016-06-12	1	-1/+1
\|/ / /
* \| \|	Merge pull request #25363 from kamipo/fix_or_result_sql	Vipul A M	2016-06-11	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix `or` result SQL [ci skip]	Ryuta Kamizono	2016-06-11	1	-1/+1
\|/ /
* \|	Merge pull request #25361 from maclover7/jm-rm-stuff	Sean Griffin	2016-06-10	1	-11/+0
\|\ \
\| * \|	Remove `_run_class_setup`	Jon Moss	2016-06-10	1	-11/+0
* \| \|	Merge pull request #25321 from prathamesh-sonpatki/update-release-notes-1	Rafael França	2016-06-10	1	-10/+33
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add missing things to release notes [ci skip]	Prathamesh Sonpatki	2016-06-07	1	-10/+33
* \| \|	Make sure the yielded variable is the logger	Rafael Mendonça França	2016-06-10	2	-4/+6
* \| \|	Merge pull request #25351 from kmcphillips/asset-default-config-quiet	Rafael França	2016-06-10	1	-0/+3
\|\ \ \
\| * \| \|	Add config.assets.quiet = true as default value	Kevin McPhillips	2016-06-10	1	-0/+3
* \| \| \|	Merge pull request #25341 from kmcphillips/master	Rafael França	2016-06-10	3	-34/+124
\|\ \ \ \
\| * \| \| \|	Be explicit about what Logger class is expected	Kevin McPhillips	2016-06-09	1	-3/+3
\| * \| \| \|	Broadcast #silence on logger. Rewrite tests.	Kevin McPhillips	2016-06-09	2	-31/+121
* \| \| \| \|	Merge pull request #25352 from Shopify/optimized-delegate	Rafael França	2016-06-10	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Replace Kernel#caller by the faster Kernel#caller_locations	Jean Boussier	2016-06-10	1	-2/+2
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #25342 from Edouard-chin/callbacks-wrong-method-name	Vipul A M	2016-06-10	1	-1/+6
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	[ci skip] `define_model_callbacks` only exist in active model:	Edouard CHIN	2016-06-10	1	-1/+6
\| \|/ / /
* \| \| \|	Merge pull request #25348 from alexcameron89/master	Jon Moss	2016-06-10	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix typo in ActionController::Renderer [ci skip]	Alex Kitchens	2016-06-10	1	-1/+1
\|/ / /
* \| \|	Merge pull request #25338 from jwworth/fix_typo_sucker_punch_1465507047	Jon Moss	2016-06-09	1	-1/+1
\|\ \ \
\| * \| \|	Fix typo, `of of` -> `of` [ci skip]	Jake Worth	2016-06-09	1	-1/+1
\|/ / /
* \| \|	Remove dead code from tests	Sean Griffin	2016-06-09	1	-17/+0
* \| \|	render_to_string Regression Outside of Real Requests in Rails 5.0.0.rc1 (#25308)	Brandon Medenwald	2016-06-09	2	-1/+8
* \| \|	Merge pull request #25329 from yahonda/allow_oracle_bind_value_syntax_in_loj_...	Sean Griffin	2016-06-09	1	-1/+1
\|\ \ \
\| * \| \|	Allow Oracle bind parameter syntax `:a1`	Yasuo Honda	2016-06-08	1	-1/+1
* \| \| \|	Merge pull request #25334 from abhishekjain16/doc_fix	Sean Griffin	2016-06-09	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fix typo	Abhishek Jain	2016-06-09	1	-2/+2
* \| \| \| \|	Merge pull request #25335 from y-yagi/remove_deprecated_prefix_option	Vipul A M	2016-06-08	1	-2/+0
\|\ \ \ \ \
\| * \| \| \| \|	remove deprecated `:prefix` option from doc [ci skip]	yuuji.yaginuma	2016-06-09	1	-2/+0
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #25332 from abhishekjain16/test_fix	Rafael França	2016-06-09	2	-3/+3
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	existant => existent	Abhishek Jain	2016-06-09	2	-3/+3
\|/ / / /
* \| \| \|	Merge pull request #25315 from schneems/schneems/inclusion-doc	Richard Schneeman	2016-06-08	1	-3/+9
\|\ \ \ \