aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1192 from arunagw/removal_extraJosé Valim2011-05-223-9/+0
|\ | | | | No more need rubygems here.
| * Not loading ruby-debug specially. Arun Agrawal2011-05-221-5/+0
| |
| * No more need rubygems here.Arun Agrawal2011-05-223-4/+0
| |
* | Merge pull request #1202 from vatrai/todo_fixJosé Valim2011-05-221-3/+3
|\ \ | | | | | | Fix todo Time.xmlschema used instead of Time.parse
| * | require 'time' Vishnu Atrai2011-05-221-1/+2
| | |
| * | Fix todo Time.xmlschema used instead of Time.parseVishnu Atrai2011-05-221-3/+2
| | |
* | | Merge pull request #1193 from arunagw/railties_testsJosé Valim2011-05-221-1/+0
|\ \ \ | | | | | | | | Loading action_controller twice removed.
| * | | Loading action_controller twice removed.Arun Agrawal2011-05-221-1/+0
| | |/ | |/|
* | | Depend on I18n ~> 0.6José Valim2011-05-221-1/+1
| | |
* | | Move I18n dependency back to ActiveSupport.José Valim2011-05-224-6/+5
| | |
* | | Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHubJosé Valim2011-05-221-0/+1
| | |
* | | Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920José Valim2011-05-222-0/+144
|\ \ \ | | | | | | | | Add method FormHelper#fields_for_with_index
| * | | Add method fields_for_with_index to FormHelperJorge Bejar2011-05-212-0/+144
| | | |
* | | | Fix failing tests.José Valim2011-05-222-1/+4
| | | |
* | | | Merge pull request #1208 from dasch/patch-1José Valim2011-05-221-1/+1
|\ \ \ \ | | | | | | | | | | Remove superfluous whitespace from ActiveModel::SecurePassword
| * | | | Remove superfluous whitespace from ActiveModel::SecurePassword Daniel Schierbeck2011-05-221-1/+1
|/ / / / | | | | | | | | Only one space is needed, yo!
* | | | Merge pull request #1206 from arunagw/jruby_openssl_loadJosé Valim2011-05-222-2/+4
|\ \ \ \ | | | | | | | | | | Let's load jruby-openssl now for all. #jruby
| * | | | Let's load jruby-openssl now for all. #jrubyArun Agrawal2011-05-222-2/+4
| | |_|/ | |/| |
* | | | Merge pull request #1199 from vatrai/jdon_engine_test_fixJosé Valim2011-05-221-0/+1
|\ \ \ \ | | | | | | | | | | test fix jdom_engine_test
| * | | | test fix jdom_engine_test Vishnu Atrai2011-05-221-0/+1
| |/ / /
* | | | Merge pull request #1198 from guilleiguaran/changelog_pluralize_table_namesJosé Valim2011-05-221-0/+8
|\ \ \ \ | |/ / / |/| | | Adding pluralize_table_names change to CHANGELOG
| * | | Adding pluralize_table_names change to CHANGELOGGuillermo Iguaran2011-05-211-0/+8
|/ / /
* | | Bump versions for rc1David Heinemeier Hansson2011-05-219-9/+9
| | |
* | | Merge pull request #1195 from dmathieu/try_undefined_methodDavid Heinemeier Hansson2011-05-212-1/+9
|\ \ \ | |_|/ |/| | Don't raise NoMethodError the tried method doesn't exists
| * | make sure missing method does not fail with argumentsdmathieu2011-05-221-0/+6
| | |
| * | don't raise NoMethodError the tried method doesn't existsdmathieu2011-05-212-1/+3
|/ /
* | Merge pull request #1191 from arunagw/removal_extraJosé Valim2011-05-214-4/+0
|\ \ | | | | | | Removal require again from tests.
| * | Removal require again from tests.Arun Agrawal2011-05-224-4/+0
| | |
* | | Merge pull request #1188 from thedarkone/duplicable-durationJosé Valim2011-05-212-1/+3
|\ \ \ | | | | | | | | Fix AS::Duration#duplicable? on 1.8
| * | | Fix AS::Duration#duplicable? on 1.8thedarkone2011-05-212-1/+3
| | | |
* | | | Merge pull request #1180 from Karunakar/documentation_changeXavier Noria2011-05-213-5/+15
|\ \ \ \ | |_|/ / |/| | | Documentation Error Fixed for ticket #839
| * | | Merge remote branch 'upstream/master' into documentation_changeGanesh Kumar2011-05-211-1/+1
| |\ \ \
| * | | | ActionMailer deliver method Documentation corrected Ticket #761Ganesh Kumar2011-05-212-2/+2
| | | | |
| * | | | Documentation Error Fixed for ticket #839Karunakar (Ruby)2011-05-211-3/+13
| | | | |
* | | | | Now that we are compatible with Rake 0.9.0, lets allow it back inDavid Heinemeier Hansson2011-05-211-1/+1
| | | | |
* | | | | Merge pull request #1174 from bilts/fix-rake-dslDavid Heinemeier Hansson2011-05-212-4/+7
|\ \ \ \ \ | | | | | | | | | | | | Make Rake::DSL methods available within Railtie rake_tasks block (so we're compatible with Rake 0.9.0).
| * | | | | Make Rake::DSL methods available within Railtie rake_tasks blockPatrick Quinn2011-05-202-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fixes incompatibility introduced by Rake 0.9.0
* | | | | | Merge pull request #1187 from thedarkone/polymorphic-class-fixSantiago Pastorino2011-05-212-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Handle polymorphic_type NOT NULL columns
| * | | | | | Handle polymorphic_type NOT NULL-able columns as well.thedarkone2011-05-212-1/+12
| | |_|_|/ / | |/| | | |
* | | | | | Uglifier works properly now with 0.5.4David Heinemeier Hansson2011-05-211-1/+1
| | | | | |
* | | | | | Bind to Rake 0.8.7 until a fix for Rake 0.9.0 is releasedDavid Heinemeier Hansson2011-05-211-1/+1
| | | | | |
* | | | | | Add support for passing mass assignment roles to dynamic finders. Closes #1170.Andrew White2011-05-212-2/+50
|/ / / / /
* | | | | Merge pull request #1182 from prakashmurthy/patch-1José Valim2011-05-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Enhanced test for duplicable in active_support/core_ext/object/duplicable.rb
| * | | | | Check for Module.new.dup as well in ↵Prakash Murthy2011-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/object/duplicable.rb
* | | | | | Merge pull request #1165 from arunagw/rubyforge_removeJosé Valim2011-05-218-8/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Not updating rubyforge for new versions.
| * | | | | Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵Arun Agrawal2011-05-208-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | not useful.
* | | | | | Merge pull request #1162 from guilleiguaran/singularize_individual_table_nameJon Leighton2011-05-216-9/+16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Singularize individual table name
| * | | | | AliasTracker.pluralize use pluralize_table_names of modelGuillermo Iguaran2011-05-202-3/+3
| | | | | |
| * | | | | Refactoring test_has_many_with_pluralize_table_names_false testGuillermo Iguaran2011-05-202-4/+2
| | | | | |
| * | | | | Allow pluralize_table_names for individual modelGuillermo Iguaran2011-05-202-2/+11
| | |_|_|/ | |/| | |