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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #9762 from senny/8079_do_not_grant_on_root_user	Rafael Mendonça França	2013-03-17	3	-3/+26
\|\
\| *	`rake db:create` does not change permissions of root user.	Yves Senn	2013-03-17	3	-3/+26
\|/
*	sets limit 191 for schema_migrations#version in mysql2 if the encoding is "ut...	Xavier Noria	2013-03-17	4	-5/+58
*	Merge pull request #9754 from macksmind/fix_actionpack_warnings	Rafael Mendonça França	2013-03-17	2	-2/+3
\|\
\| *	Fix rake test warnings in actionpack	Mack Earnhardt	2013-03-17	2	-2/+3
* \|	Merge pull request #9757 from vipulnsward/remove_message_param	Carlos Antonio da Silva	2013-03-17	1	-1/+1
\|\ \
\| * \|	remove unused parameter passed to assert_query_equal method	Vipul A M	2013-03-17	1	-1/+1
\| \|/
* \|	Merge pull request #9745 from madmax/allow_pass_multipart_to_form_for	Carlos Antonio da Silva	2013-03-17	2	-3/+3
\|\ \
\| * \|	Allow pass multipart option to form_for	Grzegorz Derebecki	2013-03-17	2	-3/+3
* \| \|	Merge pull request #9758 from vipulnsward/remove_from_rakefile	Carlos Antonio da Silva	2013-03-17	1	-2/+0
\|\ \ \
\| * \| \|	extra lines from Rakefile removed, which also threw warning	Vipul A M	2013-03-17	1	-2/+0
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #9759 from vipulnsward/remove_hash_from_tests	Carlos Antonio da Silva	2013-03-17	1	-16/+10
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	refactor test to drop unnecessary hash creation, test directly instead	Vipul A M	2013-03-17	1	-16/+10
\|/ /
* \|	Merge pull request #9747 from macksmind/refactor_friend_follower	Rafael Mendonça França	2013-03-16	6	-6/+15
\|\ \
\| * \|	Refactor Person/Friendship relationships to be more intuitive	Mack Earnhardt	2013-03-17	6	-6/+15
\|/ /
* \|	Getting Started Guide: typo fix. [ci skip]	Steve Klabnik	2013-03-16	1	-1/+1
* \|	Revert "Merge pull request #8156 from fredwu/acronym_fix-master"	Steve Klabnik	2013-03-16	3	-8/+1
* \|	Update image in Getting Started Guide [ci skip]	Steve Klabnik	2013-03-16	1	-0/+0
* \|	revises the CHANGELOG entry from 26aa265 [ci skip]	Xavier Noria	2013-03-16	1	-2/+3
* \|	Merge pull request #8156 from fredwu/acronym_fix-master	Xavier Noria	2013-03-16	3	-1/+7
\|\ \ \| \|/ \|/\|
\| *	Added Inflector#underscore fix to the changelog	Fred Wu	2013-03-17	1	-0/+4
\| *	Fixed a bug where the inflector would replace camelCase strings and disregard...	Fred Wu	2013-03-17	2	-1/+3
\|/
*	fixes markup of the CHANGELOG entry from 455d710	Xavier Noria	2013-03-16	1	-14/+14
*	Merge pull request #9737 from wangjohn/counter_cache_update_attributes_fix	Jeremy Kemper	2013-03-15	3	-0/+77
\|\
\| *	If a counter_cache is defined, then using update_attributes and changing	John Wang	2013-03-15	3	-0/+77
\|/
*	Merge pull request #9734 from choudhuryanupam/master	Rafael Mendonça França	2013-03-15	1	-2/+2
\|\
\| *	Refactored to reuse method	Anupam Choudhury	2013-03-15	1	-2/+2
* \|	Revert "make new rails apps log to STDOUT"	Steve Klabnik	2013-03-15	6	-47/+5
* \|	Merge pull request #5606 from teohm/multipart_unicode_param_name	Steve Klabnik	2013-03-15	6	-32/+54
\|\ \
\| * \|	UTF-8 encode all keys and values in nested params hash.	Teo Hui Ming	2013-03-15	6	-32/+54
* \| \|	Fix implicit join references option reversion in test	Carlos Antonio da Silva	2013-03-15	1	-1/+2
* \| \|	Merge pull request #9691 from hone/stdout_logging	Steve Klabnik	2013-03-15	6	-5/+47
\|\ \ \
\| * \| \|	make new rails apps log to STDOUT	Terence Lee	2013-03-15	6	-5/+47
* \| \| \|	Merge pull request #9733 from senny/9712_option_to_turn_references_deprecatio...	Jon Leighton	2013-03-15	4	-2/+38
\|\ \ \ \
\| * \| \| \|	make it possible to disable implicit join references.	Yves Senn	2013-03-15	4	-2/+38
\| \| \|_\|/ \| \|/\| \|
* / \| \|	Cache the association proxy object	Jon Leighton	2013-03-15	2	-1/+6
\|/ / /
* \| \|	Merge pull request #9683 from senny/deprecate_count_distinct_option	Jon Leighton	2013-03-15	24	-59/+129
\|\ \ \
\| * \| \|	Deprecate the `:distinct` option for `Relation#count`.	Yves Senn	2013-03-15	8	-15/+44
\| * \| \|	rename `Relation#uniq` to `Relation#distinct`. `#uniq` still works.	Yves Senn	2013-03-15	22	-45/+86
* \| \| \|	Merge pull request #9728 from vipulnsward/fix_em_typos	Carlos Antonio da Silva	2013-03-15	4	-5/+5
\|\ \ \ \
\| * \| \| \|	Small typos here and there.	Vipul A M	2013-03-15	4	-5/+5
* \| \| \| \|	Merge pull request #9686 from strzalek/cast_number_to_string_in_pg	Jon Leighton	2013-03-15	2	-3/+14
\|\ \ \ \ \
\| * \| \| \| \|	Cast number to string in Postgres	Łukasz Strzałkowski	2013-03-12	2	-3/+14
* \| \| \| \| \|	Merge pull request #9732 from arunagw/warning_fix_unused_variable	Andrew White	2013-03-15	1	-1/+0
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Warning removed unused variable task_name	Arun Agrawal	2013-03-15	1	-1/+0
* \| \| \| \| \|	Fix typos and improve docs a bit [ci skip]	Carlos Antonio da Silva	2013-03-15	1	-7/+5
* \| \| \| \| \|	Merge pull request #9731 from senny/9724_argument_error_on_reset_counters	Andrew White	2013-03-15	2	-1/+9
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| / / \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	`#reset_counters` verifies counter names.	Yves Senn	2013-03-15	2	-1/+9
\|/ / / /
* \| \| \|	Merge pull request #9716 from senny/rework_headers_functional_tests	Andrew White	2013-03-15	7	-19/+90
\|\ \ \ \
\| * \| \| \|	document request simulation methods in functional tests.	Yves Senn	2013-03-15	1	-7/+27