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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \|	replace apostrophe with backquote for matching [ci skip]	Anton Kalyaev	2013-05-03	1	-2/+2
\| * \| \| \|	Capitalizing internet to Internet. [ci skip]	Akshay Khole	2013-05-03	2	-2/+2
\| * \| \| \|	added to rdoc for unscope that default_scope wins	Neeraj Singh	2013-05-03	1	-0/+3
\| * \| \| \|	Simple grammar updates	Jonathan Roes	2013-05-03	1	-2/+2
\| * \| \| \|	fix typo	Vipul A M	2013-05-02	1	-1/+1
\| * \| \| \|	document String#to_time exception	Vipul A M	2013-05-02	1	-0/+1
\| * \| \| \|	Clean up the wording in a few places	Jonathan Roes	2013-05-01	1	-4/+4
\| * \| \| \|	Add a few overview bullet points	Jonathan Roes	2013-05-01	1	-0/+4
\| * \| \| \|	Fix typo "can exploited" with "can be exploited"	Leo Gallucci	2013-05-01	1	-1/+1
\| * \| \| \|	Rails 4 has deprecated :order in has_many to use a lambda instead, update the...	Nick Quaranto	2013-05-01	1	-1/+1
* \| \| \| \|	Merge pull request #10576 from sferik/remove_multi_json_dependency	Yehuda Katz	2013-05-11	4	-46/+19
\|\ \ \ \ \
\| * \| \| \| \|	Replace multi_json with json	Erik Michaels-Ober	2013-05-11	4	-46/+19
\|/ / / / /
* \| \| \| \|	Merge pull request #10574 from wangjohn/automatic_inverse_of_documentation	Rafael Mendonça França	2013-05-11	3	-1/+33
\|\ \ \ \ \
\| * \| \| \| \|	Adding documentation to the automatic inverse_of finder.	wangjohn	2013-05-11	3	-1/+33
\|/ / / / /
* \| \| \| \|	Improve CHANGELOG entry [ci kip]	Rafael Mendonça França	2013-05-11	1	-6/+10
* \| \| \| \|	Merge pull request #10503 from kstevens715/master	Rafael Mendonça França	2013-05-11	3	-1/+32
\|\ \ \ \ \
\| * \| \| \| \|	Call assume_migrated_upto_version on connection	Kyle Stevens	2013-05-11	3	-1/+32
\|/ / / / /
* \| \| \| \|	Merge pull request #10567 from neerajdotname/read_attribute_before_type_cast_...	Rafael Mendonça França	2013-05-11	3	-1/+7
\|\ \ \ \ \
\| * \| \| \| \|	read_attribute_before_type_cast should accept symbol	Neeraj Singh	2013-05-11	3	-1/+7
* \| \| \| \| \|	Merge pull request #10572 from nertzy/dont-modify-options-hash-in-primary-key	Rafael Mendonça França	2013-05-11	1	-2/+1
* \| \| \| \| \|	Merge pull request #10568 from siong1987/minor-refactoring	Xavier Noria	2013-05-11	1	-5/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Clean up unused method for `rake doc`.	Teng Siong Ong	2013-05-11	1	-5/+0
\|/ / / / /
* \| \| \| \|	Merge branch 'fix-json-encoding'	Rafael Mendonça França	2013-05-10	3	-5/+18
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Give credits to all the envolved people [ci skip]	Rafael Mendonça França	2013-05-10	1	-1/+1
\| * \| \| \|	Merge pull request #10534 from cmaruz/master	Rafael Mendonça França	2013-05-10	3	-3/+12
\| \|\ \ \ \
\| \| * \| \| \|	Added escaping of U+2028 and U+2029 inside the json encoder.	Mario Caropreso	2013-05-09	3	-5/+14
\| * \| \| \| \|	Fix syntax error on Ruby 2.0	Rafael Mendonça França	2013-05-10	1	-2/+4
\| * \| \| \| \|	Merge pull request #10057 from zackham/patch-1	Rafael Mendonça França	2013-05-10	1	-2/+4
\|/\| \| \| \| \|
\| * \| \| \| \|	Escape multibyte line terminators in JSON encoding	zackham	2013-04-02	1	-2/+4
* \| \| \| \| \|	Merge pull request #10558 from Empact/cleanup-finder-methods	Rafael Mendonça França	2013-05-10	4	-28/+25
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Extract JoinDependency#join_relation to DRY the repeated application of the #...	Ben Woosley	2013-05-10	3	-7/+9
\| * \| \| \| \| \|	In #apply_join_dependency, we can apply the #where in-place because relation ...	Ben Woosley	2013-05-10	1	-1/+1
\| * \| \| \| \| \|	DRY-up join dependency creation by extracting construct_join_depdency	Ben Woosley	2013-05-10	1	-7/+5
\| * \| \| \| \| \|	Pull the excepts into apply_join_dependency, for the sake of DRY.	Ben Woosley	2013-05-10	1	-3/+4
\| * \| \| \| \| \|	Simplify conditions within apply_join_dependency	Ben Woosley	2013-05-10	1	-9/+5
\| * \| \| \| \| \|	Move the except(:select) inside the construct_limited_ids_condition method to...	Ben Woosley	2013-05-10	1	-2/+2
\| * \| \| \| \| \|	Reject blank order_values within #columns_for_distinct, as the orders aren't ...	Ben Woosley	2013-05-10	2	-3/+3
\|/ / / / / /
* \| \| \| \| \|	Move #proxy_association method to AssociationRelation	Jon Leighton	2013-05-10	3	-4/+6
* \| \| \| \| \|	Merge pull request #6792 from Empact/postgres-distinct	Jon Leighton	2013-05-10	5	-12/+61
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix that #exists? can produce invalid SQL: "SELECT DISTINCT DISTINCT"	Ben Woosley	2013-05-10	5	-12/+61
* \| \| \| \| \| \|	Merge pull request #10553 from dasch/dasch/dont-try-to-explain-select_db	Xavier Noria	2013-05-10	2	-1/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Don't try to EXPLAIN select_db calls	Daniel Schierbeck	2013-05-10	2	-1/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #10543 from vipulnsward/to_sort	Carlos Antonio da Silva	2013-05-10	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	sort => sort! on new array	Vipul A M	2013-05-10	1	-1/+1
* \| \| \| \| \| \|	Set the inverse when association queries are refined	Jon Leighton	2013-05-10	4	-1/+33
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #10510 from think602/master	Xavier Noria	2013-05-09	1	-0/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	[ci skip] document protect_against_forgery? method	Weston Platter	2013-05-10	1	-0/+1
* \| \| \| \| \|	Merge pull request #10535 from vipulnsward/remove_var	Carlos Antonio da Silva	2013-05-09	1	-1/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	remove redundant var	Vipul A M	2013-05-09	1	-1/+0
* \| \| \| \| \| \|	Merge pull request #10536 from vipulnsward/fix_exp_warning	Carlos Antonio da Silva	2013-05-09	1	-1/+0
\|\ \ \ \ \ \ \