aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Revert "Invert precedence of content in ActionDispatch::Static"Andrew White2012-12-073-28/+12
* Invert precedence of content in ActionDispatch::StaticAndrew White2012-12-063-12/+28
* Merge pull request #8371 from freegenie/5396-conditional-fragment-cachingRafael Mendonça França2012-12-053-1/+83
|\
| * Allow fragment cache to accept :if and :unless optionsFabrizio Regini2012-12-053-1/+83
* | Merge pull request #8412 from JoeyButler/action_dispatch_routing_mapper_refac...Rafael Mendonça França2012-12-051-18/+14
|\ \ | |/ |/|
| * Extract method refactoring in ActionDispatch::Routing::SingletonResource.Joey Butler2012-12-051-18/+14
* | Merge pull request #8404 from freegenie/filter_redirectsAndrew White2012-12-056-1/+68
|\ \
| * | Adding filter capability to ActionController logsFabrizio Regini2012-12-056-1/+68
* | | Replace comments' non-breaking spaces with spacesclaudiob2012-12-042-3/+3
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-0422-283/+232
|\ \
| * | copy edits [ci skip]Vijay Dev2012-12-044-27/+18
| * | Fix a typo in ActionController::CachingJean Boussier2012-12-031-2/+1
| * | Remove nodoc from FlashHash #[]= [ci skip]Pablo Torres2012-12-011-1/+1
| * | Cleans and removes 'Examples' tag [ci skip]Alvaro Pereyra2012-12-012-4/+0
| * | Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-016-62/+44
| * | Add documentation to AssetTagHelper#image_alt [ci skip]Florent Guilleux2012-12-011-0/+3
| * | Fixes wrong typo on FormHelper [ci skip]Alvaro Pereyra2012-12-011-1/+1
| * | Cleans documentation from Helpers [ci skip]Alvaro Pereyra2012-12-015-121/+98
| * | Revert "Remove trailing whitespaces"Florent Guilleux2012-12-012-2/+2
| * | Remove trailing whitespacesFlorent Guilleux2012-12-012-2/+2
| * | Improves documentation of Capture helper [ci skip]Alvaro Pereyra2012-12-012-14/+13
| * | Removes :nodoc: tag on AtomFeedHelper [ci skip]Alvaro Pereyra2012-12-011-3/+3
| * | Removes unneeded 'Example' tags and whitespaces [ci skip]Alvaro Pereyra2012-12-011-45/+42
| * | nodoc AD & AV railties classesCarlos Duclos2012-12-012-2/+2
| * | Remove :nodoc from SanitizeHelper module [ci skip]HPNeo2012-12-011-1/+1
| * | Removes :nodoc: label [ci skip]Alvaro Pereyra2012-12-011-1/+1
| * | Improves documentation on favicon_link_tagAlvaro Pereyra2012-12-011-14/+16
| * | Update documentation for javascript_include_tag [ci skip]HPNeo2012-12-011-10/+13
* | | Fixed issue where routes with globs caused constraints on that glob toMaura Fitzgerald2012-12-043-1/+34
| |/ |/|
* | Override <%== to always behave as literal text rather than toggling based on ...Jeremy Kemper2012-12-033-4/+21
* | More descriptive error when rendering a partial with `:layout => true`Yves Senn2012-12-023-1/+16
|/
* hash filters should be accessed with symbols or stringsFrancesco Rodriguez2012-11-302-3/+30
* Merge pull request #8363 from Takehiro-Adachi/add-string-options-examples-to-...Carlos Antonio da Silva2012-11-291-3/+9
|\
| * added examples when options is stringTakehiro Adachi2012-11-291-3/+9
* | Add CHANGELOG entries for the observes extractionRafael Mendonça França2012-11-291-0/+4
|/
* Remove observers and sweepersRafael Mendonça França2012-11-285-179/+2
* Merge pull request #8318 from Empact/fixture-fileRafael Mendonça França2012-11-272-5/+19
|\
| * Use File.join to better integrate fixture_path in fixture_file_upload.Ben Woosley2012-11-262-5/+19
* | Cleanup CacheHelper changes allowing opt-out of cache digestsDrew Ulmer2012-11-271-2/+2
* | Add CHANGELOG entry for opt-out option of automatic template digestingDrew Ulmer2012-11-271-0/+8
* | No sort Hash options in #grouped_options_for_selectSergey Kojin2012-11-273-7/+7
* | Fix Strong Parameters docs.Uģis Ozols2012-11-271-2/+1
* | unshift html-scanner into $LOAD_PATH rather than appendAkira Matsuda2012-11-271-1/+1
* | Remove warning of circular requireRafael Mendonça França2012-11-271-1/+1
* | Accept symbols as #send_data :disposition valueElia Schito2012-11-273-0/+15
* | @steveklabnik can't spell 'distance.'Steve Klabnik2012-11-261-1/+1
* | Add changelog for #7997.Steve Klabnik2012-11-261-0/+2
* | Improve clarity of routing testsAndrew White2012-11-261-634/+1081
* | Merge pull request #8316 from roberto/assert_template_validate_optionsCarlos Antonio da Silva2012-11-263-1/+11
|\ \
| * | assert_template: validating option keysRoberto Soares2012-11-253-1/+11