aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Require sprockets beta 8Joshua Peek2011-05-221-1/+1
|
* Add debug_asset supportJoshua Peek2011-05-224-17/+58
|
* Lock to stable sprockets betaJoshua Peek2011-05-221-1/+1
|
* Fix I18n dependency as final is out.José Valim2011-05-222-2/+2
|
* 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
| | | | |
* | | | | Merge pull request #1179 from castlerock/activesupport_testJosé Valim2011-05-211-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | fixed failing tests of ActiveSupport for deprecation test
| * | | | fixed failing tests of ActiveSupport for deprecation testRaghunadh2011-05-211-1/+1
|/ / / /
* | | | Correct example and expand on description of :shallow option for resourcesAndrew White2011-05-211-3/+7
| | | |
* | | | Merge pull request #1178 from joshk/ruby19_warningJosé Valim2011-05-201-3/+3
|\ \ \ \ | | | | | | | | | | Corrected a minor ruby19 variable name reuse warning
| * | | | corrected a minor ruby19 variable name reuse warningJosh Kalderimis2011-05-211-3/+3
|/ / / /
* | | | Merge pull request #1177 from joshk/ruby19_warningsJosé Valim2011-05-202-2/+0
|\ \ \ \ | | | | | | | | | | Fixed some ruby 19 warnings
| * | | | fixed some ruby 19 warnings, including circular requires and variable name reuseJosh Kalderimis2011-05-212-2/+0
| | | | |
* | | | | Merge pull request #1175 from joshk/active_resource_correctionJosé Valim2011-05-201-4/+16
|\ \ \ \ \ | |_|_|_|/ |/| | | | attr_accessor_with_default removed from ActiveResource
| * | | | attr_accessor_with_default is deprecated, so lets not use it in ActiveResourceJosh Kalderimis2011-05-211-4/+16
| |/ / /