aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6502 from rafmagana/guides_refactor_rakefileXavier Noria2012-05-293-22/+89
|\
| * [guides] fix reference to railties directory, guides are no longer thereRafael Magana2012-05-281-1/+1
| * [guides] guides:generate:kindle is the new interface to generate .mobi file i...Rafael Magana2012-05-283-18/+3
| * [guides] get rid of any reference to the generator script since rake tasks ar...Rafael Magana2012-05-282-6/+4
| * [guides] update generator.rb to refer to guides:generate instead of generate_...Rafael Magana2012-05-271-1/+1
| * [guides] update guides guidelines with the new generation and validation rake...Rafael Magana2012-05-271-5/+23
| * [guides] Add rake task to show help and make it the default oneRafael Magana2012-05-261-0/+50
| * [guides] Add :guides namespace and :html and :kindle tasks to RakefileRafael Magana2012-05-261-9/+25
* | copy edits the upgrading guideXavier Noria2012-05-291-9/+9
* | Merge pull request #6518 from kennyj/fix_5847-4José Valim2012-05-2911-2/+83
|\ \
| * | Fix #5847 and #4045 on master.kennyj2012-05-301-0/+2
| * | Use runner hook to load ActiveRecord::Base.kennyj2012-05-301-0/+4
| * | Add support runner hook.kennyj2012-05-296-0/+53
| * | SchemaMigration should be loaded lazily.kennyj2012-05-293-2/+1
| * | Add a testcase for #5847.kennyj2012-05-291-0/+23
|/ /
* | Merge pull request #6535 from arunagw/jruby_module_testCarlos Antonio da Silva2012-05-291-1/+1
|\ \
| * | JRuby return different Array for module contents.Arun Agrawal2012-05-291-1/+1
|/ /
* | Merge pull request #6525 from freerange/minitest-passthrough-exceptionsJosé Valim2012-05-292-8/+62
|\ \
| * | Avoid dependency on MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.James Mead2012-05-291-2/+10
| * | Exceptions like Interrupt should not be rescued.James Mead2012-05-282-8/+54
* | | Merge pull request #6528 from frodsan/update_hash_syntax_gemfile_templateJosé Valim2012-05-291-1/+1
|\ \ \
| * | | update Gemfile template to 1.9 hash syntaxFrancesco Rodriguez2012-05-291-1/+1
|/ / /
* | | Merge pull request #6526 from appfolio/decoupling_activesupport_from_actionivewCarlos Antonio da Silva2012-05-282-4/+44
|\ \ \
| * | | decoupling activesupport performance testing from actionview and adding testsAndrew Mutz2012-05-282-4/+44
|/ / /
* | | Merge pull request #6527 from frodsan/add_test_to_delete_by_fixnum_or_stringCarlos Antonio da Silva2012-05-281-0/+20
|\ \ \
| * | | Add tests to delete by fixnum or string id with has many through associationsFrancesco Rodriguez2012-05-281-0/+20
|/ / /
* | | Add note about CollectionAssociation#delete change to upgrading guide [ci skip]Carlos Antonio da Silva2012-05-291-0/+4
* | | Fix failing build related to change in CollectionAssociation#deleteCarlos Antonio da Silva2012-05-291-1/+1
* | | Review requires from number helperCarlos Antonio da Silva2012-05-283-15/+11
* | | Yield only one argument instead of splatting.Carlos Antonio da Silva2012-05-282-2/+9
* | | Allow blocks for count with ActiveRecord::Relation. Document and test that su...chrisfinne2012-05-282-3/+30
* | | Merge pull request #6511 from frodsan/add_fixnum_string_support_for_deleteCarlos Antonio da Silva2012-05-284-3/+57
|\ \ \
| * | | Add support for CollectionAssociation#delete by Fixnum or StringFrancesco Rodriguez2012-05-284-3/+57
* | | | Parse float value only once in number helpersCarlos Antonio da Silva2012-05-281-11/+11
|/ / /
* | | Merge pull request #6522 from lest/patch-1José Valim2012-05-283-5/+1
|\ \ \ | |/ / |/| |
| * | make AS::Multibyte::Chars work w/o multibyte core extSergey Nartimov2012-05-281-1/+1
| * | remove unnecessary requireSergey Nartimov2012-05-282-4/+0
|/ /
* | Merge pull request #6517 from purcell/validates-false-valueJosé Valim2012-05-283-0/+8
|\ \
| * | Don't enable validations when passing false hash values to ActiveModel.validatesSteve Purcell2012-05-283-0/+8
|/ /
* | Merge pull request #6512 from jaredbeck/fix_number_to_currency_neg_formatJosé Valim2012-05-282-1/+3
|\ \
| * | Fix handling of negative zero in number_to_currencyJared Beck2012-05-282-1/+3
|/ /
* | Merge pull request #6315 from appfolio/moving_number_helper_methods_to_active...José Valim2012-05-2813-287/+1536
|\ \
| * | Moving NumberHelpers from ActionView to ActiveSupportAndrew Mutz2012-05-2713-287/+1536
* | | Fix sorting of helpers from different pathsPiotr Sarnacki2012-05-286-2/+57
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-275-17/+68
|\ \
| * | copy edits [ci skip]Vijay Dev2012-05-271-3/+3
| * | update Module#mattr_accessor documentation [ci skip]Francesco Rodriguez2012-05-261-6/+6
| * | remove unnecessary ruby 1.8 reference from active_record/core [ci skip]Francesco Rodriguez2012-05-261-3/+4
| * | add CollectionProxy#uniq documentationFrancesco Rodriguez2012-05-261-0/+21
| * | update Hash documentation with 1.9 syntax [ci skip]Francesco Rodriguez2012-05-261-8/+16