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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fixing issue when delegating to methods named "block", "args", or "arg"	Jake Bell	2015-08-19	2	-5/+21
*	Merge pull request #21294 from maclover7/codeofconduct	Guillermo Iguaran	2015-08-19	3	-0/+9
\|\
\| *	Add code of conduct to README.md and to contributing guide [ci skip]	maclover7	2015-08-18	3	-0/+9
* \|	Merge pull request #21292 from CoralineAda/coc	David Heinemeier Hansson	2015-08-19	1	-0/+22
\|\ \
\| * \|	Adds a code of conduct	CoralineAda	2015-08-18	1	-0/+22
* \| \|	Merge pull request #21282 from sjain1107/added_docs	Yves Senn	2015-08-19	1	-0/+3
\|\ \ \
\| * \| \|	Added docs for TableDefinition #coloumns & #remove_column [ci skip]	sjain1107	2015-08-18	1	-0/+3
* \| \| \|	make the routes reader private	Aaron Patterson	2015-08-18	2	-1/+2
* \| \| \|	don't touch internals	Aaron Patterson	2015-08-18	1	-1/+1
* \| \| \|	drop array allocations when building paths	Aaron Patterson	2015-08-18	2	-8/+8
* \| \| \|	symbols will always be constructed with strings. :bomb:	Aaron Patterson	2015-08-18	1	-1/+1
* \| \| \|	drop string allocations for each resource	Aaron Patterson	2015-08-18	1	-0/+2
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #21110 from kamipo/mysql_json_support	Rafael Mendonça França	2015-08-18	11	-50/+258
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add a native JSON data type support in MySQL	Ryuta Kamizono	2015-08-18	11	-50/+258
\|/ /
* \|	Merge pull request #21283 from ravindrakumawat/add_docs_for_pending_migration	Yves Senn	2015-08-18	1	-0/+1
\|\ \
\| * \|	Add Docs for ActiveRecord #check_pending [ci skip]	ravindra kumar kumawat	2015-08-18	1	-0/+1
* \| \|	Merge pull request #21284 from prakashlaxkar/argument_error_tests	Yves Senn	2015-08-18	2	-1/+9
\|\ \ \
\| * \| \|	Correct error message in Standard American english and add a test case for th...	prakash	2015-08-18	2	-1/+14
\|/ / /
* \| \|	Remove unreached default value	Rafael Mendonça França	2015-08-17	1	-1/+1
* \| \|	Merge pull request #21278 from byroot/try-arity-check	Rafael Mendonça França	2015-08-17	1	-1/+1
\|\ \ \
\| * \| \|	Use == 0 instead of .zero? in #try	Jean Boussier	2015-08-17	1	-1/+1
* \| \| \|	use the strategy pattern to match request verbs	Aaron Patterson	2015-08-17	2	-16/+49
* \| \| \|	switch Route constructors and pass in the regexp	Aaron Patterson	2015-08-17	1	-9/+15
* \| \| \|	split the verb regex from the constraints hash	Aaron Patterson	2015-08-17	1	-6/+17
* \| \| \|	test the verb method on the route, specifically	Aaron Patterson	2015-08-17	1	-1/+1
* \| \| \|	routes are always constructed with a hash for the conditions	Aaron Patterson	2015-08-17	3	-4/+4
* \| \| \|	introduce an alternate constructor for Route objects	Aaron Patterson	2015-08-17	3	-13/+17
* \| \| \|	drop object allocation during routes setup	Aaron Patterson	2015-08-17	2	-44/+89
\|/ / /
* \| \|	avoid is_a? checks	Aaron Patterson	2015-08-17	2	-2/+4
* \| \|	pull RegexpOffsets in to a method	Aaron Patterson	2015-08-17	1	-27/+14
* \| \|	`required_defaults` is always passed in, remove conditional	Aaron Patterson	2015-08-17	1	-1/+1
* \| \|	Merge pull request #21276 from rodzyn/fix_build	Rafael Mendonça França	2015-08-17	1	-0/+1
\|\ \ \
\| * \| \|	Fix master build	Marcin Olichwirowicz	2015-08-17	1	-0/+1
\|/ / /
* \| \|	Merge pull request #21273 from piton4eg/patch-6	Robin Dupret	2015-08-17	1	-6/+5
\|\ \ \
\| * \| \|	Small fixes [ci skip]	Alexey Markov	2015-08-17	1	-6/+5
* \| \| \|	use predicate methods to avoid is_a? checks	Aaron Patterson	2015-08-17	2	-1/+3
* \| \| \|	default pattern to use a joined string	Aaron Patterson	2015-08-17	4	-16/+20
\|/ / /
* \| \|	Merge pull request #21270 from jonatack/update-debugging-guide-byebug-info	Kasper Timm Hansen	2015-08-17	1	-17/+6
\|\ \ \
\| * \| \|	Update the Debugging Rails Guide	Jon Atack	2015-08-17	1	-17/+6
* \| \| \|	Merge pull request #21244 from ronakjangir47/method_call_assertions_fix	Kasper Timm Hansen	2015-08-17	2	-1/+7
\|\ \ \ \
\| * \| \| \|	Replacing lambda with proc getting argument error because of it.	Ronak Jangir	2015-08-17	2	-1/+7
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #21272 from amitsuroliya/fix_docs	Arun Agrawal	2015-08-17	1	-1/+1
\|\ \ \ \
\| * \| \| \|	fix Docs [ci skip]	amitkumarsuroliya	2015-08-18	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #21271 from amitsuroliya/typo_fix	Richard Schneeman	2015-08-17	1	-2/+2
\|\ \ \ \
\| * \| \| \|	typo fix [ci skip]	amitkumarsuroliya	2015-08-18	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #21252 from rodzyn/improve_params_parser	Rafael Mendonça França	2015-08-17	1	-2/+11
\|\ \ \ \
\| * \| \| \|	Cleanup ActionDispatch:ParamsParser	Marcin Olichwirowicz	2015-08-17	1	-2/+11
* \| \| \| \|	reorganize testing guide. [Zachary Scott & Yves Senn]	Zachary Scott	2015-08-17	1	-329/+305
* \| \| \| \|	Merge pull request #21264 from jonatack/fix-action-controller-strong-params-typo	Rafael Mendonça França	2015-08-17	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	[skip ci] Fix minor typo	Jon Atack	2015-08-17	1	-1/+1
\|/ / / /