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

	Commit message (Expand)	Author	Age	Files	Lines
*	Tweaked wording used in some tests.	Sebastian McKenzie	2015-10-25	5	-16/+16
*	Merge pull request #22040 from arunagw/remove-jruby-travis-opts	Yves Senn	2015-10-24	1	-2/+0
\|\
\| *	Remove JRUBY_OPTS from .travis.yml file	Arun Agrawal	2015-10-23	1	-2/+0
* \|	Merge pull request #22054 from tgxworld/jruby_issue_fixed	Matthew Draper	2015-10-24	1	-4/+0
\|\ \
\| * \|	Remove skip on tests that have been fixed.	Guo Xiang Tan	2015-10-24	1	-4/+0
\|/ /
* \|	Merge pull request #22033 from jmccartie/jm/uuid_nil	Rafael Mendonça França	2015-10-23	8	-19/+28
\|\ \
\| * \|	Stop aligning the arguments	Rafael Mendonça França	2015-10-23	1	-4/+4
\| * \|	Use thor class_option to make the primary_key_type option work	Rafael Mendonça França	2015-10-23	6	-16/+20
\| * \|	Move default uuid generation to active_record	Jon McCartie	2015-10-23	5	-11/+16
\|/ /
* \|	Merge pull request #22052 from piton4eg/patch-10	Arthur Nogueira Neves	2015-10-23	1	-1/+1
\|\ \
\| * \|	Fix punctuation [ci skip]	Markov Alexey	2015-10-23	1	-1/+1
* \| \|	Merge pull request #21990 from greysteil/invalid-utf8-querystrings	Kasper Timm Hansen	2015-10-23	4	-7/+37
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Catch invalid UTF-8 querystring values and respond with BadRequest	Grey Baker	2015-10-23	4	-7/+37
\|/ /
* \|	Merge pull request #22038 from tgxworld/fix_random_error_when_running_tests_w...	Kasper Timm Hansen	2015-10-23	1	-0/+6
\|\ \
\| * \|	FIX: Randomly failing test when running without GIL.	Guo Xiang Tan	2015-10-23	1	-0/+6
* \| \|	Merge pull request #22037 from kamipo/remove_no_need_binds_empty	Sean Griffin	2015-10-23	1	-3/+3
\|\ \ \
\| * \| \|	Remove no need `binds.empty?` checking	Ryuta Kamizono	2015-10-23	1	-3/+3
\| \|/ /
* \| \|	Merge pull request #22041 from y-yagi/remove_unnecessary_files_indummy_applic...	Richard Schneeman	2015-10-23	2	-1/+14
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	remove unnecessary readme in dummy application	yuuji.yaginuma	2015-10-23	2	-1/+14
\| \|/
* \|	Merge pull request #22035 from yui-knk/update_doc_anonymous	Yves Senn	2015-10-23	1	-2/+4
\|\ \ \| \|/ \|/\|
\| *	[ci skip] Add more code examples for `Module#anonymous?` docs	yui-knk	2015-10-23	1	-2/+4
\|/
*	API guidelines reword re the Oxford comma [ci skip]	Xavier Noria	2015-10-22	1	-3/+4
*	Revert "[ci skip] removed extra comma"	Xavier Noria	2015-10-22	1	-1/+1
*	Merge pull request #22034 from hemalijain/patch-2	Rafael Mendonça França	2015-10-22	1	-1/+1
\|\
\| *	[ci skip] removed extra comma	hemali jain	2015-10-23	1	-1/+1
\|/
*	`config.generators` should be docummented since it is public API	Rafael Mendonça França	2015-10-22	1	-1/+1
*	Merge pull request #22029 from yui-knk/fixup_content_type_regexp	Rafael Mendonça França	2015-10-22	1	-1/+1
\|\
\| *	Use sufficient a regexp anchor to check `@response.content_type.to_s`	yui-knk	2015-10-22	1	-1/+1
* \|	Merge pull request #21918 from bogdan/refactor-preloader	Sean Griffin	2015-10-22	1	-42/+30
\|\ \
\| * \|	Refactored association preloader for performance	Bogdan Gusiev	2015-10-22	1	-42/+30
* \| \|	Merge pull request #19327 from rousisk/master	Sean Griffin	2015-10-22	3	-3/+19
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Change Integer#year to return a Fixnum instead of a Float to improve consistency	Konstantinos Rousis	2015-10-22	3	-3/+19
* \| \|	Merge pull request #22028 from yui-knk/suppress_deprecated_warning_test	Kasper Timm Hansen	2015-10-22	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Suppress warnings (warnings about AD::IntegrationTest HTTP request)	yui-knk	2015-10-22	1	-1/+1
\|/ /
* \|	Merge pull request #21950 from rafaelsales/issues/21922-fix-ar-group-by-attri...	Andrew White	2015-10-22	4	-11/+17
\|\ \
\| * \|	Refactor Calculations#execute_grouped_calculation and clean AR test case	Rafael Sales	2015-10-22	2	-11/+4
\| * \|	Fix generated projection fields in group by query	Rafael Sales	2015-10-22	3	-1/+14
* \| \|	Merge pull request #22011 from kamipo/remove_unused_args_again	Andrew White	2015-10-22	4	-24/+14
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove `#tables` extra args again	Ryuta Kamizono	2015-10-22	4	-24/+14
\|/ /
* \|	Merge pull request #22019 from timoschilling/patch-2	Sean Griffin	2015-10-21	1	-1/+0
\|\ \
\| * \|	remove unnecessary forwardable require	Timo Schilling	2015-10-21	1	-1/+0
\|/ /
* \|	Merge pull request #22018 from jbranchaud/move-getter-to-attr-reader	Andrew White	2015-10-21	1	-5/+1
\|\ \
\| * \|	Extract native getter to attr_reader.	jbranchaud	2015-10-21	1	-5/+1
* \| \|	Merge pull request #20026 from rails/remove-possible-singleton-method	Andrew White	2015-10-21	3	-4/+32
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add Module#remove_possible_singleton_method	Andrew White	2015-10-21	3	-4/+32
\|/ /
* \|	move documentation of column options to `add_column`. Closes #20400.	Yves Senn	2015-10-21	2	-79/+81
* \|	Merge pull request #22013 from NelsonScott/patch-1	Yves Senn	2015-10-21	1	-1/+1
\|\ \
\| * \|	typo	Scott Nelson	2015-10-20	1	-1/+1
\|/ /
* \|	Really fix test failures caused by #19851	Sean Griffin	2015-10-20	1	-5/+6
* \|	Fix test failures caused by #19851	Sean Griffin	2015-10-20	1	-5/+5