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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #10769 from senny/10615_join_should_not_return_readonly_re...	Rafael Mendonça França	2013-05-27	5	-28/+29
\|\
\| *	`implicit_readonly` is being removed in favor of calling `readonly` explicitly	Yves Senn	2013-05-27	5	-24/+25
\| *	cleanup whitespace in `active_record/relation.rb`.	Yves Senn	2013-05-27	1	-4/+4
\|/
*	Merge pull request #10763 from senny/10758_to_sentence_with_blank_elements	Carlos Antonio da Silva	2013-05-26	1	-0/+4
\|\
\| *	add test-case for `Array#to_sentence with blank items.	Yves Senn	2013-05-26	1	-0/+4
* \|	Merge pull request #10762 from vipulnsward/change_compatibility	Carlos Antonio da Silva	2013-05-26	1	-3/+3
\|\ \
\| * \|	compatability => compatibility	Vipul A M	2013-05-26	1	-3/+3
\| \|/
* \|	Merge pull request #10761 from vipulnsward/fix-typo-1	Carlos Antonio da Silva	2013-05-26	4	-4/+4
\|\ \ \| \|/ \|/\|
\| *	Fix some typo in method names, variables	Vipul A M	2013-05-26	4	-4/+4
* \|	Add note about decorator loading in Engines guide.	Steve Klabnik	2013-05-24	1	-0/+26
\|/
*	Merge pull request #10222 from senny/update_bundler_section_in_assets_guide	Rafael Mendonça França	2013-05-23	1	-9/+7
\|\
\| *	asset guide, match application.rb snippets to the generated file [ci skip]	Yves Senn	2013-04-15	1	-9/+7
* \|	Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many	Rafael Mendonça França	2013-05-23	4	-2/+15
\|\ \
\| * \|	Fix the `:primary_key` option for `has_many` associations.	Yves Senn	2013-05-23	4	-2/+15
* \| \|	Merge branch 'deprecate-validator-setup'	Rafael Mendonça França	2013-05-23	8	-42/+61
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	deprecate Validator#setup (to get rid of a respond_to call). validators do th...	Nick Sutterer	2013-05-23	8	-42/+61
\|/ /
* \|	Add CHANGELOG entry for 99860582b2b1c0fc42bf84c52aac57b243d42678	Rafael Mendonça França	2013-05-22	1	-0/+6
* \|	Require only minitest.	Rafael Mendonça França	2013-05-22	2	-2/+2
* \|	Merge pull request #10667 from rubys/minitest-autorun	Rafael Mendonça França	2013-05-22	2	-2/+2
\|\ \
\| * \|	Eliminate minitest warnings	Sam Ruby	2013-05-17	2	-2/+2
* \| \|	Merge pull request #10725 from neerajdotname/remove_code_duplication	Carlos Antonio da Silva	2013-05-22	1	-2/+3
\|\ \ \
\| * \| \|	remove code duplication	Neeraj Singh	2013-05-22	1	-2/+3
\|/ / /
* \| \|	Merge pull request #10714 from tkhr/extract_test_from_base_test.rb_in_AR	Carlos Antonio da Silva	2013-05-22	4	-45/+54
\|\ \ \
\| * \| \|	Extract AR::Persistence#becomes's test code out from base_test.rb	Takehiro Adachi	2013-05-22	2	-13/+13
\| * \| \|	Extract AR::AttributeMethods#attribute_for_inspect's test code out from base_...	Takehiro Adachi	2013-05-22	2	-8/+8
\| * \| \|	Extract AR::Core#inspect and AR::Core.inspect's test code from base_test.rb	Takehiro Adachi	2013-05-22	2	-24/+33
* \| \| \|	Merge pull request #10722 from jgaskins/patch-1	José Valim	2013-05-22	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Add ActiveModel requirement to application.rb	Jamie Gaskins	2013-05-22	1	-0/+1
\|/ / / /
* \| \| \|	reverse comparison because of strange AS behavior	Aaron Patterson	2013-05-21	1	-1/+1
* \| \| \|	just set the default argument, a nil parent should be an error	Aaron Patterson	2013-05-21	1	-2/+1
* \| \| \|	fold the collection rather than multiple assigments	Aaron Patterson	2013-05-21	1	-3/+2
* \| \| \|	use drop rather than calculate the array length	Aaron Patterson	2013-05-21	1	-1/+1
* \| \| \|	Merge branch 'bindwhere'	Aaron Patterson	2013-05-21	2	-20/+42
\|\ \ \ \
\| * \| \| \|	avoid creating a set if no where values are removed	Aaron Patterson	2013-05-21	2	-0/+14
\| * \| \| \|	remove bind values for where clauses that were removed	Aaron Patterson	2013-05-21	2	-9/+18
\| * \| \| \|	push partitioning up so bind elimination can get the removed wheres	Aaron Patterson	2013-05-21	1	-5/+3
\| * \| \| \|	push partion logic down and initialization logic up	Aaron Patterson	2013-05-21	1	-15/+11
\| * \| \| \|	partition the where values so we can access the removed ones	Aaron Patterson	2013-05-20	1	-1/+6
\| \|/ / /
* \| \| \|	Merge pull request #10711 from senny/10660_rake_db_test_prepare_needs_config	Rafael Mendonça França	2013-05-21	1	-1/+1
\|\ \ \ \
\| * \| \| \|	the rake task `db:test:prepare` needs to load the configuration	Yves Senn	2013-05-21	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #10702 from divineforest/use-total-in-batches-test	Carlos Antonio da Silva	2013-05-21	1	-7/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	In batches test @total was assigned but not used. Use it in tests instead of ...	Alexander Balashov	2013-05-21	1	-7/+5
\|/ / /
* \| \|	eliminate some conditionals	Aaron Patterson	2013-05-20	1	-3/+3
* \| \|	change method name to reflect what it actually does.	Aaron Patterson	2013-05-20	1	-2/+2
* \| \|	save the where values in variables so we don't need to look them up all	Aaron Patterson	2013-05-20	1	-4/+5
* \| \|	pass where values to the helper function rather than rely on internal state	Aaron Patterson	2013-05-20	1	-4/+4
* \| \|	Merge pull request #10697 from zhubert/patch-1	Steve Klabnik	2013-05-20	1	-1/+1
\|\ \ \
\| * \| \|	Spelling correction in Upgrading Guide	Zack Hubert	2013-05-20	1	-1/+1
\|/ / /
* \| \|	Add has_named_route? to the mapper API	José Valim	2013-05-20	2	-0/+18
* \| \|	No need CHANGELOG entry for a test fix	Rafael Mendonça França	2013-05-20	1	-4/+1