aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3-2-8' into 3-2-stableSantiago Pastorino2012-08-093-4/+4
|\
| * Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
| * Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-091-1/+1
| * escape select_tag :prompt valuesSantiago Pastorino2012-08-091-2/+2
| * Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
* | Remove references to old behavior with headers atRafael Mendonça França2012-08-071-4/+3
* | Rearrange example output of javascript_include_tagPrem Sichanugrist2012-08-061-2/+2
* | Do not include application.js if it doesn't existsPrem Sichanugrist2012-08-061-5/+6
* | Revert "Merge pull request #6084 from brainopia/support_for_magic_domain_on_a...Rafael Mendonça França2012-08-051-7/+0
* | Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_storesJosé Valim2012-08-021-0/+7
|/
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
* Revert "Deprecate link_to_function and button_to_function helpers"Rafael Mendonça França2012-08-011-4/+0
* Revert "Deprecate `:mouseover` options for `image_tag` helper."Rafael Mendonça França2012-08-011-2/+0
* Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op...Rafael Mendonça França2012-08-013-29/+9
* adds a missing require from Active SupportXavier Noria2012-07-281-0/+1
* bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
* * Do not convert digest auth strings to symbols. CVE-2012-3424Aaron Patterson2012-07-261-2/+2
* updating the versionAaron Patterson2012-07-231-2/+2
* Add support for optional root segments containing slashesAndrew White2012-07-171-1/+1
* Fixed bug creating invalid HTML in select optionsRusty Geldmacher2012-07-101-5/+5
* Show in log correct wrapped keysDmitry Vorotilin2012-07-051-1/+2
* Fix NumberHelper options wrapping to prevent verbatim blocks being rendered i...Mark J. Titorenko2012-07-021-90/+159
* Merge pull request #6649 from route/logger_in_metal_3_2Carlos Antonio da Silva2012-06-181-2/+4
|\
| * ActionController::Metal doesn't have logger method, check it and then delegateDmitry Vorotilin2012-06-161-2/+4
* | Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-161-1/+7
|/
* ActionController::Caching depends on RackDelegation and AbstractController::C...Santiago Pastorino2012-06-131-0/+3
* bumping version numbersAaron Patterson2012-06-111-1/+1
* Array parameters should not contain nil values.Aaron Patterson2012-06-111-2/+4
* Fix railties test suitePiotr Sarnacki2012-06-081-2/+1
* Fix asset tags for files with more than one dotPiotr Sarnacki2012-06-071-1/+3
* Revert "fix the Flash middleware loading the session on every request (very d...Rafael Mendonça França2012-06-052-3/+7
* Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-06-052-2/+13
* 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
|\
| * Use to_model delegates for polymorphic route generationNathaniel Bibler2012-06-011-1/+7
* | Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-011-2/+5
|/
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
* bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
* Strip [nil] from parameters hash.Aaron Patterson2012-05-301-0/+22
* bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
* remove unnecessary memcache equire in ActionDispatch::Session::CacheStoreBrian Durand2012-05-261-1/+0
* Assets: don't add extension if other given and file existsSergey Nartimov2012-05-211-2/+7
* Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stableRafael Mendonça França2012-05-201-1/+1
|\
| * Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-201-1/+1
* | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
|\ \ | |/ |/|
| * Prevent concurrent compilation of templates - closes #6400Tom Clarke2012-05-201-10/+22
* | Use right option for excerpt text helper in tests, fix buildCarlos Antonio da Silva2012-05-191-2/+2
* | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-181-2/+2
* | Deprecate old APIs for highlight, excerpt and word_wrapJeremy Walker2012-05-181-0/+9
* | Deprecate `:disable_with` for `button_tag` tooCarlos Galdino + Rafael Mendonça França2012-05-142-2/+4