Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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). | ||||
| * | | | | Make Rake::DSL methods available within Railtie rake_tasks block | Patrick Quinn | 2011-05-20 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | Fixes incompatibility introduced by Rake 0.9.0 | ||||
* | | | | | Merge pull request #1187 from thedarkone/polymorphic-class-fix | Santiago Pastorino | 2011-05-21 | 2 | -1/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Handle polymorphic_type NOT NULL columns | ||||
| * | | | | | Handle polymorphic_type NOT NULL-able columns as well. | thedarkone | 2011-05-21 | 2 | -1/+12 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Uglifier works properly now with 0.5.4 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Bind to Rake 0.8.7 until a fix for Rake 0.9.0 is released | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add support for passing mass assignment roles to dynamic finders. Closes #1170. | Andrew White | 2011-05-21 | 2 | -2/+50 |
|/ / / / | |||||
* | | | | Merge pull request #1182 from prakashmurthy/patch-1 | José Valim | 2011-05-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Enhanced test for duplicable in active_support/core_ext/object/duplicable.rb | ||||
| * | | | | Check for Module.new.dup as well in ↵ | Prakash Murthy | 2011-05-21 | 1 | -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_remove | José Valim | 2011-05-21 | 8 | -8/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Not updating rubyforge for new versions. | ||||
| * | | | | Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵ | Arun Agrawal | 2011-05-20 | 8 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | not useful. | ||||
* | | | | | Merge pull request #1162 from guilleiguaran/singularize_individual_table_name | Jon Leighton | 2011-05-21 | 6 | -9/+16 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Singularize individual table name | ||||
| * | | | | AliasTracker.pluralize use pluralize_table_names of model | Guillermo Iguaran | 2011-05-20 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Refactoring test_has_many_with_pluralize_table_names_false test | Guillermo Iguaran | 2011-05-20 | 2 | -4/+2 |
| | | | | | |||||
| * | | | | Allow pluralize_table_names for individual model | Guillermo Iguaran | 2011-05-20 | 2 | -2/+11 |
| | | | | | |||||
* | | | | | Merge pull request #1179 from castlerock/activesupport_test | José Valim | 2011-05-21 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | fixed failing tests of ActiveSupport for deprecation test | ||||
| * | | | | fixed failing tests of ActiveSupport for deprecation test | Raghunadh | 2011-05-21 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Correct example and expand on description of :shallow option for resources | Andrew White | 2011-05-21 | 1 | -3/+7 |
| | | | | |||||
* | | | | Merge pull request #1178 from joshk/ruby19_warning | José Valim | 2011-05-20 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Corrected a minor ruby19 variable name reuse warning | ||||
| * | | | | corrected a minor ruby19 variable name reuse warning | Josh Kalderimis | 2011-05-21 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge pull request #1177 from joshk/ruby19_warnings | José Valim | 2011-05-20 | 2 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | Fixed some ruby 19 warnings | ||||
| * | | | | fixed some ruby 19 warnings, including circular requires and variable name reuse | Josh Kalderimis | 2011-05-21 | 2 | -2/+0 |
| | | | | | |||||
* | | | | | Merge pull request #1175 from joshk/active_resource_correction | José Valim | 2011-05-20 | 1 | -4/+16 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | attr_accessor_with_default removed from ActiveResource | ||||
| * | | | | attr_accessor_with_default is deprecated, so lets not use it in ActiveResource | Josh Kalderimis | 2011-05-21 | 1 | -4/+16 |
| |/ / / | |||||
* | | | | Temporarily ship with ContentLength middleware. | José Valim | 2011-05-20 | 7 | -15/+47 |
| | | | | |||||
* | | | | Merge pull request #1169 from senny/specify_a_custom_active_model_name | José Valim | 2011-05-20 | 2 | -3/+41 |
|\ \ \ \ | | | | | | | | | | | Specify the name to be used for ActiveModel::Name fixes #1168 | ||||
| * | | | | Specify the name to be used for ActiveModel::Name fixes #1168 | Yves Senn | 2011-05-20 | 2 | -3/+41 |
|/ / / / | | | | | | | | | | | | | This patch allows to specify the name of your models independent of the class name. | ||||
* | | | | Merge pull request #1157 from smartinez87/extra_whitespaces | Xavier Noria | 2011-05-20 | 1 | -3/+3 |
|\ \ \ \ | |_|_|/ |/| | | | Remove extra white spaces. | ||||
| * | | | Remove extra white spaces. | Sebastian Martinez | 2011-05-19 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #1161 from guilleiguaran/each_syntax_in_activerecord | Xavier Noria | 2011-05-20 | 4 | -4/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Syntax cleanup: for in => each on ActiveRecord |