aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-011-1/+2
* Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-011-1/+7
* Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-012-3/+6
* Merge branch 'master-sec'Aaron Patterson2012-05-311-0/+22
|\
| * Strip [nil] from parameters hash.Aaron Patterson2012-05-301-0/+22
| * 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-311-7/+15
* | Simplify link_to using content_tagCarlos Antonio da Silva2012-05-311-12/+6
* | 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-301-3/+28
* | 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-282-285/+38
|\ \ \
| * | | Moving NumberHelpers from ActionView to ActiveSupportAndrew Mutz2012-05-272-285/+38
| |/ /
* / / Fix sorting of helpers from different pathsPiotr Sarnacki2012-05-281-2/+2
|/ /
* | Add `:escape` option for `truncate`Rafael Mendonça França2012-05-261-2/+5
* | Update the documentation and add CHANGELOG entryRafael Mendonça França2012-05-261-3/+3
* | Test that the block used in truncate is escaped if it is not HTML safeRafael Mendonça França2012-05-261-13/+12
* | Truncate now has the ability to receive a html option that allows it to call ...Li Ellis Gallardo2012-05-261-2/+12
* | 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-251-3/+3
|/ /
* | 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
* | | Merge pull request #6453 from parndt/session_keysJosé Valim2012-05-221-0/+8
|\ \ \
| * | | Added ActionDispatch::Request::Session#keys and ActionDispatch::Request::Sess...Philip Arndt2012-05-231-0/+8
* | | | Refactor date related helpersCarlos Galdino2012-05-226-50/+26
|/ / /
* | | Merge pull request #6359 from carlosgaldino/add-html5-inputsJeremy Kemper2012-05-228-0/+248
|\ \ \
| * | | Add several HTML5 input helpersCarlos Galdino2012-05-217-0/+205
| * | | Add HTML5 input[type="color"] helperCarlos Galdino2012-05-214-0/+43
* | | | Fixed typo new_defautls -> new_defaults.Philip Arndt2012-05-231-2/+2
| |_|/ |/| |
* | | Merge pull request #6429 from marcandre/fix_test_requestCarlos Antonio da Silva2012-05-211-1/+1
|\ \ \
| * | | Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-05-211-1/+1
* | | | Add instance_accessor option to class_attributeAlexey Vakhov2012-05-221-2/+1
|/ / /
* | | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"José Valim2012-05-211-68/+19
* | | Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-211-19/+68
|\ \ \ | |/ / |/| |
| * | More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| * | Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-211-19/+50
* | | Merge pull request #2549 from trek/RoutingErrorForMissingControllersAaron Patterson2012-05-211-3/+7
|\ \ \
| * | | When a route references a missing controller, raise ActionController::Routing...Trek Glowacki2011-08-161-3/+7
* | | | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22