aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-sec'Aaron Patterson2012-06-122-2/+8
|\
| * Array parameters should not contain nil values.Aaron Patterson2012-06-122-2/+8
* | content_type is already a Mime::Type objectSantiago Pastorino2012-06-121-1/+1
* | This consider_all_requests_local doesn't make senseSantiago Pastorino2012-06-122-21/+2
|/
* Return proper format on exceptionsSantiago Pastorino2012-06-113-14/+81
* both string and sumbol will be interpolated as string no need to convert to_sganesh2012-06-112-8/+8
* Symbol responds_to :upcase & :downcase in Ruby >= 1.9Akira Matsuda2012-06-062-4/+4
* stop `to_s`ing method namesAkira Matsuda2012-06-061-16/+16
* fix meaningless test caseAkira Matsuda2012-06-061-1/+1
* One-liner code for logger in ActionView::Helpers::ControllerHelperDmitry Vorotilin2012-06-051-5/+1
* Merge pull request #6631 from yuki24/use_block_in_button_helperJosé Valim2012-06-052-3/+18
|\
| * accept a block in button helper.Yuki Nishijima2012-06-052-3/+18
* | Metal controller doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-051-2/+8
|/
* Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-014-1/+24
* Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-012-2/+34
* Sync CHANGLOG with the 3-2-stable branchRafael Mendonça França2012-06-011-0/+32
* Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-014-3/+27
* Merge branch 'master-sec'Aaron Patterson2012-05-312-1/+28
|\
| * Strip [nil] from parameters hash.Aaron Patterson2012-05-302-1/+28
| * Fix the buildSantiago Pastorino2012-05-221-1/+0
| * require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-221-0/+1
* | Extracted redirect logic from ActionController::Force::ClassMethods.force_sslJeremy Friesen2012-05-313-7/+50
* | Simplify link_to using content_tagCarlos Antonio da Silva2012-05-312-12/+26
* | Make link_to arguments explicitCarlos Antonio da Silva2012-05-311-8/+4
* | Make button_to arguments explicit and refactor a bitCarlos Antonio da Silva2012-05-311-10/+6
* | Simplify logic to initialize valid conditions in RouteSetCarlos Antonio da Silva2012-05-311-7/+3
* | accept a block in button_to helperSergey Nartimov2012-05-303-3/+51
* | no need to pass an empty block to button_to helperSergey Nartimov2012-05-301-2/+2
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-301-1/+1
|\ \
| * | fix typo in render_template [ci skip]Brent Vatne2012-05-291-1/+1
* | | Review requires from number helperCarlos Antonio da Silva2012-05-281-4/+1
* | | Parse float value only once in number helpersCarlos Antonio da Silva2012-05-281-11/+11
* | | Merge pull request #6315 from appfolio/moving_number_helper_methods_to_active...José Valim2012-05-283-285/+49
|\ \ \
| * | | Moving NumberHelpers from ActionView to ActiveSupportAndrew Mutz2012-05-273-285/+49
| |/ /
* / / Fix sorting of helpers from different pathsPiotr Sarnacki2012-05-285-2/+53
|/ /
* | 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-262-3/+5
* | Test that the block used in truncate is escaped if it is not HTML safeRafael Mendonça França2012-05-262-25/+23
* | Truncate now has the ability to receive a html option that allows it to call ...Li Ellis Gallardo2012-05-262-10/+41
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-4/+3
|\ \
| * | references to the old behavior removedMikhail Vaysman2012-05-251-4/+3
* | | Remove implicit dependency on pathnameJosé Valim2012-05-252-4/+4
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-232-5/+13
|\ \
| * | Revert "Remove blank trailing comments"Vijay Dev2012-05-2329-0/+67
| * | copy edit[ci skip]Vijay Dev2012-05-231-1/+1
| * | Fix incorrect example for fields_for - without the '=' it will not output any...David Morton2012-05-221-1/+1
| * | Remove blank trailing commentsHenrik Hodne2012-05-2029-67/+0
| * | Update documentation for AbstractController::BaseHenrik Hodne2012-05-201-3/+11
* | | Add license field to gemspecs, by Matt GriffinMatt Griffin2012-05-231-0/+1
* | | Merge pull request #6453 from parndt/session_keysJosé Valim2012-05-222-0/+24
|\ \ \