aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * add examples to Hash#deep_stringify_keys and Hash#deep_symbolize_keys [ci skip]Francesco Rodriguez2012-05-261-0/+10
| * Add some information about handle_unverified_request to guides.Erich Menge2012-05-261-0/+11
| * Revert "Small correction to contributing_to_rails in the section for testing ...Deepak Kannan2012-05-261-6/+0
| * Small correction to contributing_to_rails in the section for testing ActiveRe...Deepak Kannan2012-05-261-0/+6
* | Fix railties_order when application object is passedPiotr Sarnacki2012-05-272-1/+5
* | Update initialization guide [ci skip]Vijay Dev2012-05-271-64/+32
* | Add `:escape` option for `truncate`Rafael Mendonça França2012-05-263-2/+29
* | Update the documentation and add CHANGELOG entryRafael Mendonça França2012-05-263-4/+6
* | Test that the block used in truncate is escaped if it is not HTML safeRafael Mendonça França2012-05-262-25/+23
* | Merge pull request #6031 from lellisga/truncate_readmeRafael Mendonça França2012-05-263-10/+45
|\ \ | |/ |/|
| * Truncate now has the ability to receive a html option that allows it to call ...Li Ellis Gallardo2012-05-263-10/+45
|/
* some small corrections & wrapping changes in the initialization guideVijay Dev2012-05-261-11/+4
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-2611-76/+344
|\
| * fix mention of ruby versions that rails 4 won't run on [ci skip]Vijay Dev2012-05-261-1/+1
| * make it explicit that bundle install at the time of app creationVijay Dev2012-05-261-1/+1
| * [routing guide] Add mention of get '/:username' routeRyan Bigg2012-05-261-0/+8
| * add :nodoc: to CollectionProxy#initializeFrancesco Rodriguez2012-05-251-1/+1
| * add CollectionProxy#== documentationFrancesco Rodriguez2012-05-251-0/+24
| * add CollectionProxy#count documentationFrancesco Rodriguez2012-05-251-0/+26
| * add CollectionProxy#to_ary documentationFrancesco Rodriguez2012-05-251-2/+35
| * add CollectionProxy#delete documentationFrancesco Rodriguez2012-05-251-1/+104
| * Update paths in action_view_overview raislguide to reflect asset pipeline con...Tadas Tamosauskas2012-05-251-22/+28
| * [getting started] specify which kind of temporary files are stored in the /tm...Rafael Magana2012-05-251-1/+1
| * [Guides] Add missing file descriptionsOscar Del Ben2012-05-251-1/+17