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

	Commit message (Expand)	Author	Age	Files	Lines
*	require 'rake/rdoctask' if failed to require 'rdoc/task'	Akira Matsuda	2011-05-26	5	-6/+27
*	Merge pull request #1260 from flippingbits/master	José Valim	2011-05-25	2	-1/+5
\|\
\| *	Add test for shebang in engine's script/rails file	Stefan Sprenger	2011-05-24	1	-0/+5
\| *	Merge branch 'master' of https://github.com/rails/rails	Stefan Sprenger	2011-05-24	1	-1/+2
\| \|\
\| * \|	Remove shebang from the template since it's already added by the	Stefan Sprenger	2011-05-24	1	-1/+0
* \| \|	Merge pull request #1297 from cesario/1294-allocated-object-cant-be-inspected	José Valim	2011-05-25	2	-6/+18
\|\ \ \
\| * \| \|	Fix the AR::Base#inspect method [closes #1294]	Franck Verrot	2011-05-25	1	-6/+10
\| * \| \|	Test AR::Base#inspect on an allocated object not yet initialized	Franck Verrot	2011-05-25	1	-0/+8
\|/ / /
* \| \|	Merge pull request #1293 from janx/master	José Valim	2011-05-25	1	-4/+3
\|\ \ \
\| * \| \|	fix Rails::Paths::Root document	Jan Xie	2011-05-25	1	-4/+3
* \| \| \|	Merge pull request #1292 from arunagw/database_generators	José Valim	2011-05-25	1	-2/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Database.rake file fixed for load_generators	Arun Agrawal	2011-05-25	1	-2/+1
\|/ / /
* \| \|	Merge pull request #1290 from arunagw/load_generators_use	José Valim	2011-05-25	1	-1/+1
\|\ \ \
\| * \| \|	Using load_generators	Arun Agrawal	2011-05-25	1	-1/+1
\|/ / /
* \| \|	Use load_generators instead.	José Valim	2011-05-25	1	-4/+2
* \| \|	Merge pull request #1288 from guilleiguaran/railties-deprecations	José Valim	2011-05-25	15	-287/+1
\|\ \ \
\| * \| \|	Removing deprecated config.generators in Rails::Railtie	Guillermo Iguaran	2011-05-25	1	-5/+0
\| * \| \|	Remove deprecated plugin generator	Guillermo Iguaran	2011-05-24	11	-202/+0
\| * \| \|	Removing Deprecated Path API tests	Guillermo Iguaran	2011-05-24	1	-53/+0
\| * \| \|	Removing deprecated config.paths.app.controller API	Guillermo Iguaran	2011-05-24	2	-27/+1
* \| \| \|	Merge pull request #1287 from guilleiguaran/removing-test_load_generators_fro...	José Valim	2011-05-25	1	-7/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	load_generators_from_railties was removed, remove failing test_load_generator...	Guillermo Iguaran	2011-05-24	1	-7/+0
* \| \| \|	Merge pull request #1286 from arunagw/fixed_failing_generators_test	Aaron Patterson	2011-05-24	2	-2/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	fixed test_deliver_is_notified need base_mailer	Arun Agrawal	2011-05-25	1	-0/+1
\| * \| \|	Fixed failing tests for generators_test	Arun Agrawal	2011-05-25	1	-2/+2
\|/ / /
* \| \|	Everyone receives app as argument for consistency.	José Valim	2011-05-25	6	-18/+22
* \| \|	Actually this file may be invoked directly as well with --dev.	José Valim	2011-05-25	2	-1/+3
* \| \|	Streamline generators initialization flow.	José Valim	2011-05-25	7	-23/+11
* \| \|	Update default Gemfile to point to sass-rails, not sass	wycats	2011-05-24	1	-1/+1
* \| \|	Fix infinite recursion where a lazy default scope references a scope. Fixes #...	Jon Leighton	2011-05-25	4	-4/+36
* \| \|	Hide css:* and the default stylesheet from rails g	wycats	2011-05-24	1	-1/+6
* \| \|	Update generator config to support hiding namespaces and pass the app into ge...	wycats	2011-05-24	4	-4/+12
* \| \|	Move SCSS generators and default templates from Rails to the Sass Railtie (d4...	tomhuda	2011-05-24	12	-124/+61
* \| \|	Change compressor API so that plugins can register default compressors for th...	tomhuda	2011-05-24	3	-5/+11
* \| \|	Merge pull request #1283 from joshk/actiom_mailer_tests_fixed	José Valim	2011-05-24	1	-0/+1
\|\ \ \
\| * \| \|	corrected the ActionMailer tests which broke due to some code removed from Ac...	Josh Kalderimis	2011-05-25	1	-0/+1
\|/ / /
* \| \|	Merge pull request #1281 from joshk/removed_action_pack_deprecations	José Valim	2011-05-24	17	-213/+6
\|\ \ \
\| * \| \|	removed deprecated methods, and related tests, from ActionPack	Josh Kalderimis	2011-05-24	17	-213/+6
* \| \| \|	Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope	Jon Leighton	2011-05-24	4	-1/+16
\|\ \ \ \
\| * \| \| \|	Ignore :includes on through associations	Andrew White	2011-05-24	4	-1/+16
* \| \| \| \|	Ensure that the surrounding code in Relation#to_a respects the default_scope ...	Jon Leighton	2011-05-24	1	-17/+24
* \| \| \| \|	Failing tests for #1233.	Andrew White	2011-05-24	2	-0/+75
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #1279 from dasch/patch-2	José Valim	2011-05-24	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Also use double quotes for #source	Daniel Schierbeck	2011-05-24	1	-1/+1
* \| \| \| \|	Merge pull request #1279 from dasch/patch-2	José Valim	2011-05-24	1	-7/+7
\|\\| \| \| \|
\| * \| \| \|	Use quotes consistently in Gemfile	Daniel Schierbeck	2011-05-24	1	-7/+7
\|/ / / /
* \| \| \|	Merge pull request #1239 from alindeman/master	José Valim	2011-05-24	1	-4/+4
\|\ \ \ \
\| * \| \| \|	Use set data structure to speed up circular reference checks on large/deeply ...	Andy Lindeman	2011-05-23	1	-4/+4
* \| \| \| \|	Merge pull request #1278 from vijaydev/rake-doctask-warning-fix	José Valim	2011-05-24	5	-10/+10
\|\ \ \ \ \
\| * \| \| \| \|	fixes Rake::RDocTask deprecation warnings from rake 0.9.0	Vijay Dev	2011-05-25	5	-10/+10
\|/ / / / /