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

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove extra white-spaces.	Sebastian Martinez	2011-05-19	1	-24/+24
*	Closes GH #1032	John Paul Ashenfelter	2011-05-19	1	-1/+1
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-18	7	-21/+23
\|\
\| *	Explicitly use ActiveRecord::IrreversibleMigration	Malcolm Locke	2011-05-18	1	-1/+1
\| *	Prevent duplicable comments from being the opening paragraph for Object docs	Evan Farrar	2011-05-18	1	-0/+2
\| *	Better doc styling in ActiveRecord::Locking	Sebastian Martinez	2011-05-17	2	-17/+17
\| *	fix coding error in readme reported in rails GH #980	Vijay Dev	2011-05-17	1	-1/+1
\| *	Link changes lighthouse to github	Arun Agrawal	2011-05-16	1	-1/+1
\| *	Mailer example has more sense calling to deliver method	Guillermo Iguaran	2011-05-15	1	-1/+1
* \|	Merge pull request #1133 from joshk/options_merger_test	José Valim	2011-05-18	1	-4/+4
\|\ \
\| * \|	Fix misspelling of 'lambda'. Closes #987	Ben Orenstein	2011-05-18	1	-4/+4
\|/ /
* \|	Merge pull request #1132 from joshk/ares_changelog	José Valim	2011-05-18	1	-4/+8
\|\ \
\| * \|	updated the ActiveResource changelog	Josh Kalderimis	2011-05-18	1	-4/+8
* \| \|	Merge pull request #1131 from joshk/active_model_xml_fix	José Valim	2011-05-18	2	-2/+8
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Attributes with :string type should not be given the type passed in model ser...	Jim Herzberg	2011-05-18	2	-2/+8
\|/ /
* \|	Merge pull request #1129 from amatsuda/pgsql_schema_query_format	Santiago Pastorino	2011-05-18	1	-1/+1
\|\ \
\| * \|	on.upcase!	Akira Matsuda	2011-05-19	1	-1/+1
\|/ /
* \|	Merge pull request #1122 from amatsuda/postgres_schema_queries	Aaron Patterson	2011-05-18	1	-26/+15
\|\ \
\| * \|	why not use JOIN statement for joining tables? (vol. 2)	Akira Matsuda	2011-05-18	1	-21/+12
\| * \|	remove unused table from FROM clause	Akira Matsuda	2011-05-18	1	-2/+0
\| * \|	why not use JOIN statement for joining tables?	Akira Matsuda	2011-05-18	1	-3/+3
* \| \|	Merge pull request #1126 from sikachu/bump_rack_mount	José Valim	2011-05-18	1	-1/+1
\|\ \ \
\| * \| \|	Update Rack::Mount to 0.8.1	Prem Sichanugrist	2011-05-18	1	-1/+1
* \| \| \|	Merge pull request #1124 from amatsuda/fix_railties_warnings	José Valim	2011-05-18	17	-138/+138
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	be sure to parenthesize the arguments when the first one is a RegExp literal	Akira Matsuda	2011-05-18	14	-134/+133
\| * \| \|	parenthesize the arguments with splat	Akira Matsuda	2011-05-18	2	-4/+4
\| * \| \|	initialize @inside_template	Akira Matsuda	2011-05-18	1	-0/+1
\|/ / /
* \| \|	Merge pull request #1115 from joshk/active_resource_json_updates	José Valim	2011-05-18	22	-407/+431
\|\ \ \
\| * \| \|	corrected some further tests and docs for the ARes change to json change	Josh Kalderimis	2011-05-18	7	-108/+108
\| * \| \|	removed a contrived ARes example	Josh Kalderimis	2011-05-18	1	-15/+0
\| * \| \|	updated all the tests in ARes to work with json	Josh Kalderimis	2011-05-18	18	-283/+324
\| * \| \|	move the ARes conn test to the correct location	Josh Kalderimis	2011-05-18	1	-5/+5
\| * \| \|	remove a circular dependency	Josh Kalderimis	2011-05-18	1	-2/+0
* \| \| \|	Merge pull request #1123 from amatsuda/generator_for_to_each	José Valim	2011-05-18	7	-10/+10
\|\ \ \ \
\| * \| \| \|	for ... in => .each	Akira Matsuda	2011-05-18	7	-10/+10
* \| \| \| \|	Merge pull request #1117 from joshk/as_numeric_time	José Valim	2011-05-18	2	-0/+3
\|\ \ \ \ \
\| * \| \| \| \|	add some missing requires for AS core_ext/numeric/time. Closes #1038	Josh Kalderimis	2011-05-18	2	-0/+3
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #1116 from guilleiguaran/typo_in_app_generator_test	José Valim	2011-05-18	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Fixing typo in test for turn gem	Guillermo Iguaran	2011-05-18	1	-1/+1
\| \|/ / /
* / / /	set log encoding to BINARY, but still use text mode to output portable newlines	Xavier Noria	2011-05-18	1	-6/+9
\|/ / /
* \| \|	Merge pull request #1112 from FLOChip/turn	José Valim	2011-05-17	2	-2/+31
\|\ \ \
\| * \| \|	don't include 'turn' gem in Gemfile if test unit is skipped.	Teng Siong Ong	2011-05-18	2	-1/+8
\| * \| \|	add tests for ruby-debug gem in Gemfile and make sure that ruby-debug19 is us...	Teng Siong Ong	2011-05-18	2	-1/+15
\| * \| \|	add test case for turn gem for testunit.	siong1987	2011-05-18	1	-0/+8
\| \|/ /
* \| \|	Merge pull request #1114 from arunagw/databaseyml_doc	José Valim	2011-05-17	2	-0/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Putting back mysql2 and sqlite3 in database.yml docs. In case people use "--s...	Arun Agrawal	2011-05-18	2	-0/+5
\|/ /
* \|	Add missing require	Santiago Pastorino	2011-05-17	1	-0/+1
* \|	Run bundle install once when using plugin_new --full --mountable. Closes #555	Santiago Pastorino	2011-05-17	2	-0/+6
* \|	bumping arel requirement	Aaron Patterson	2011-05-17	1	-1/+1
* \|	Ensure Set-Cookie is not set on assets.	José Valim	2011-05-17	2	-25/+27