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

	Commit message (Collapse)	Author	Age	Files	Lines
*	We don't need to load version any more as Sprockets.beta8 is included.	Arun Agrawal	2011-05-23	2	-8/+0
\|
*	Merge branch '3-1-stable'	Joshua Peek	2011-05-22	6	-18/+61
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec
\| *	Require sprockets beta 8	Joshua Peek	2011-05-22	1	-1/+1
\| \|
\| *	Add debug_asset support	Joshua Peek	2011-05-22	4	-17/+58
\| \|
\| *	Lock to stable sprockets beta	Joshua Peek	2011-05-22	1	-1/+1
\| \|
\| *	Fix I18n dependency as final is out.	José Valim	2011-05-22	2	-2/+2
\| \|
* \|	Revert "Take into account time spent in AR even if a redirect occurs or if ↵	David Heinemeier Hansson	2011-05-22	2	-31/+3
\| \| \| \| \| \| \| \| \| \| \| \|	it is after the render" because it's causing test failures about missing db_during_render. This reverts commit 60b55baca9e381deb3a0a85580f089f4caf551d4.
* \|	Merge pull request #1221 from sikachu/fix_tests	David Heinemeier Hansson	2011-05-22	2	-2/+8
\|\ \ \| \| \| \| \| \|	Make sure that we're able to run Action Pack test standalone.
\| * \|	Make sure that we're able to run Action Pack test standalone.	Prem Sichanugrist	2011-05-22	2	-2/+8
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sprocket was trying to look for these two things: * `Rails::VERSION::STRING` * `.initializer(str)` in `Rails::Engine` This commit added require to version.rb into Abstract Unit, and mocking the `Rails::Engine.initializer` in `sprockets_helper_test.rb`
* \|	Fix problem with loading polymorphic associations which have been defined in ↵	Jon Leighton	2011-05-22	5	-15/+35
\| \| \| \| \| \| \| \|	an abstract superclass. Fixes #552.
* \|	Merge pull request #1219 from fcheung/db_time_fix	José Valim	2011-05-22	2	-3/+31
\|\ \ \| \| \| \| \| \|	Take into account time spent in AR even if a redirect occurs or if it is
\| * \|	Take into account time spent in AR even if a redirect occurs or if it is ↵	Frederick Cheung	2011-05-22	2	-3/+31
\|/ / \| \| \| \| \| \|	after the render
* \|	Merge pull request #1215 from vatrai/remove_require_tzinfo	José Valim	2011-05-22	1	-3/+1
\|\ \ \| \| \| \| \| \|	remove require active_support/tzinfo as file dosent exists #TODO fix
\| * \|	remove require active_support/tzinfo as file dosent exists #TODO fix	Vishnu Atrai	2011-05-22	1	-3/+1
\| \| \|
* \| \|	Merge pull request #1192 from arunagw/removal_extra	José Valim	2011-05-22	3	-9/+0
\|\ \ \ \| \|/ / \|/\| \|	No more need rubygems here.
\| * \|	Not loading ruby-debug specially.	Arun Agrawal	2011-05-22	1	-5/+0
\| \| \|
\| * \|	No more need rubygems here.	Arun Agrawal	2011-05-22	3	-4/+0
\| \| \|
* \| \|	Merge pull request #1202 from vatrai/todo_fix	José Valim	2011-05-22	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Fix todo Time.xmlschema used instead of Time.parse
\| * \| \|	require 'time'	Vishnu Atrai	2011-05-22	1	-1/+2
\| \| \| \|
\| * \| \|	Fix todo Time.xmlschema used instead of Time.parse	Vishnu Atrai	2011-05-22	1	-3/+2
\| \| \| \|
* \| \| \|	Merge pull request #1193 from arunagw/railties_tests	José Valim	2011-05-22	1	-1/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Loading action_controller twice removed.
\| * \| \| \|	Loading action_controller twice removed.	Arun Agrawal	2011-05-22	1	-1/+0
\| \| \|/ / \| \|/\| \|
* \| \| \|	Depend on I18n ~> 0.6	José Valim	2011-05-22	1	-1/+1
\| \| \| \|
* \| \| \|	Move I18n dependency back to ActiveSupport.	José Valim	2011-05-22	4	-6/+5
\| \| \| \|
* \| \| \|	Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHub	José Valim	2011-05-22	1	-0/+1
\| \| \| \|
* \| \| \|	Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920	José Valim	2011-05-22	2	-0/+144
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Add method FormHelper#fields_for_with_index
\| * \| \|	Add method fields_for_with_index to FormHelper	Jorge Bejar	2011-05-21	2	-0/+144
\| \| \| \|
* \| \| \|	Fix failing tests.	José Valim	2011-05-22	2	-1/+4
\| \| \| \|
* \| \| \|	Merge pull request #1208 from dasch/patch-1	José Valim	2011-05-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove superfluous whitespace from ActiveModel::SecurePassword
\| * \| \| \|	Remove superfluous whitespace from ActiveModel::SecurePassword	Daniel Schierbeck	2011-05-22	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \|	Only one space is needed, yo!
* \| \| \|	Merge pull request #1206 from arunagw/jruby_openssl_load	José Valim	2011-05-22	2	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Let's load jruby-openssl now for all. #jruby
\| * \| \| \|	Let's load jruby-openssl now for all. #jruby	Arun Agrawal	2011-05-22	2	-2/+4
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #1199 from vatrai/jdon_engine_test_fix	José Valim	2011-05-22	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	test fix jdom_engine_test
\| * \| \| \|	test fix jdom_engine_test	Vishnu Atrai	2011-05-22	1	-0/+1
\| \|/ / /
* \| \| \|	Merge pull request #1198 from guilleiguaran/changelog_pluralize_table_names	José Valim	2011-05-22	1	-0/+8
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Adding pluralize_table_names change to CHANGELOG
\| * \| \|	Adding pluralize_table_names change to CHANGELOG	Guillermo Iguaran	2011-05-21	1	-0/+8
\|/ / /
* \| \|	Bump versions for rc1	David Heinemeier Hansson	2011-05-21	9	-9/+9
\| \| \|
* \| \|	Merge pull request #1195 from dmathieu/try_undefined_method	David Heinemeier Hansson	2011-05-21	2	-1/+9
\|\ \ \ \| \|_\|/ \|/\| \|	Don't raise NoMethodError the tried method doesn't exists
\| * \|	make sure missing method does not fail with arguments	dmathieu	2011-05-22	1	-0/+6
\| \| \|
\| * \|	don't raise NoMethodError the tried method doesn't exists	dmathieu	2011-05-21	2	-1/+3
\|/ /
* \|	Merge pull request #1191 from arunagw/removal_extra	José Valim	2011-05-21	4	-4/+0
\|\ \ \| \| \| \| \| \|	Removal require again from tests.
\| * \|	Removal require again from tests.	Arun Agrawal	2011-05-22	4	-4/+0
\| \| \|
* \| \|	Merge pull request #1188 from thedarkone/duplicable-duration	José Valim	2011-05-21	2	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Fix AS::Duration#duplicable? on 1.8
\| * \| \|	Fix AS::Duration#duplicable? on 1.8	thedarkone	2011-05-21	2	-1/+3
\| \| \| \|
* \| \| \|	Merge pull request #1180 from Karunakar/documentation_change	Xavier Noria	2011-05-21	3	-5/+15
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Documentation Error Fixed for ticket #839
\| * \| \|	Merge remote branch 'upstream/master' into documentation_change	Ganesh Kumar	2011-05-21	1	-1/+1
\| \|\ \ \
\| * \| \| \|	ActionMailer deliver method Documentation corrected Ticket #761	Ganesh Kumar	2011-05-21	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Documentation Error Fixed for ticket #839	Karunakar (Ruby)	2011-05-21	1	-3/+13
\| \| \| \| \|
* \| \| \| \|	Now that we are compatible with Rake 0.9.0, lets allow it back in	David Heinemeier Hansson	2011-05-21	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1174 from bilts/fix-rake-dsl	David Heinemeier Hansson	2011-05-21	2	-4/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make Rake::DSL methods available within Railtie rake_tasks block (so we're compatible with Rake 0.9.0).