aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7890 from AvnerCohen/new_hash_syntaxVijay Dev2012-10-101-9/+9
|\
| * moving to new hash syntax, for discussion before I take the time on full foldersAvnerCohen2012-10-091-9/+9
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-112-2/+2
|\ \
| * | Closed unclosed <tt>, working on a complete solution for docrails, but testin...AvnerCohen2012-10-081-1/+1
| * | Space between "every" and "time"schneems2012-10-021-1/+1
* | | Add changelog entry for killing the asset tag concatenationDavid Heinemeier Hansson2012-10-101-0/+2
* | | Remove expansion configJoshua Peek2012-10-101-2/+0
* | | Remove old asset tag concatenationJoshua Peek2012-10-105-1130/+16
| |/ |/|
* | Rename "Fixtures" class to "FixtureSet"Alexey Muranov2012-10-071-1/+1
* | Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a fe...Jeremy Kemper2012-10-061-1/+1
* | Fix nodoc commentRafael Mendonça França2012-10-071-16/+15
* | More Ruby 1.9 hash syntax.Rafael Mendonça França2012-10-061-52/+47
* | We don't need to check blank? here.Rafael Mendonça França2012-10-061-1/+1
* | Update some code styles.Rafael Mendonça França2012-10-062-200/+228
* | Accept :remote as symbol in link_to optionsRiley Lynch2012-10-063-2/+21
* | can't pass :locals to #assert_template without a view test case. Closes #3415Yves Senn2012-10-063-4/+24
* | We don't need the each call since grep take a block and yield each matchRafael Mendonça França2012-10-061-1/+1
* | Allow parameter filters to match multi-parameter attributesRafael Mendonça França2012-10-052-0/+34
* | Revert "Use flat_map { } instead of map {}.flatten"Santiago Pastorino2012-10-051-2/+2
* | Use flat_map { } instead of map {}.flattenSantiago Pastorino2012-10-051-2/+2
* | Update CHANGELOG entry about rack-cache extractGuillermo Iguaran2012-10-041-3/+7
* | config.action_dispatch.rack_cache should set explicitly to enable Rack::CacheGuillermo Iguaran2012-10-041-6/+1
* | Remove unneeded CHANGELOG entry.Rafael Mendonça França2012-10-041-3/+0
* | Merge pull request #7847 from bloudermilk/recursive_permitDavid Heinemeier Hansson2012-10-043-0/+15
|\ \
| * | ActionController::Parameters#permit! is recursiveBrendan Loudermilk2012-10-043-0/+15
* | | Do not set removed optionRafael Mendonça França2012-10-041-1/+0
|/ /
* | Merge pull request #7833 from frodsan/extract_ap_pages_actions_cachingRafael Mendonça França2012-10-047-1138/+58
|\ \
| * | add CHANGELOG entry for AP page and action caching extraction [ci skip]Francesco Rodriguez2012-10-041-0/+11
| * | rename page_cache_extension option to default_static_extensionFrancesco Rodriguez2012-10-033-11/+28
| * | extract AP Page and Action caching to actionpack-deprecated_caching gemFrancesco Rodriguez2012-10-035-1138/+30
* | | Add nodoc to now public fragment_name_with_digestRyan Garver2012-10-041-0/+1
* | | Merge branch 'master' into feature/public-fragment_name_with_digestRyan Garver2012-10-0225-209/+359
|\| |
| * | Failsafe exception returns text/plain.Steve Klabnik2012-10-013-3/+21
| * | Merge pull request #7708 from bdurand/optimize_log_subscribersRafael Mendonça França2012-10-012-8/+16
| |\ \
| | * | Optimize log subscribers to check if the log level is sufficient before perfo...Brian Durand2012-09-302-8/+16
| * | | Add the CHANGELOG entry that Guillermo forgot :PSantiago Pastorino2012-10-021-0/+5
| * | | Merge pull request #7794 from guilleiguaran/extract-rack-cacheSantiago Pastorino2012-10-011-1/+0
| |\ \ \
| | * | | Use Rack::Cache middleware only if is in GemfileGuillermo Iguaran2012-10-011-1/+0
| | | |/ | | |/|
| * | | prefix TemplateAssertions ivars (#7459)Yves Senn2012-10-013-23/+29
| * | | resource and resources do no longer modify passed optionsYves Senn2012-10-013-2/+27
| * | | fix cache store testSteve Klabnik2012-09-301-0/+1
| * | | Add a changelog entry for asset aliasing update in sprockets-rails. Supports ...Jeremy Kemper2012-09-301-0/+14
| * | | Fix changelog entry about sprockets-railsGuillermo Iguaran2012-09-301-3/+2
| * | | Whitespaces :scissors: [ci skip]Rafael Mendonça França2012-09-302-11/+14
| * | | `assert_template` no more passing with what ever string that matches.Hugo Roque2012-09-294-5/+51
| |/ /
| * | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-288-119/+139
| |\ \
| | * | update image_tag output in examples to actualNihad Abbasov2012-09-251-4/+4
| | * | update AC::ConditionalGet documentation [ci skip]Francesco Rodriguez2012-09-221-27/+31
| | * | update AC::Caching documentation [ci skip]Francesco Rodriguez2012-09-225-87/+103
| | * | remove AC::Parameters reference [ci skip]Francesco Rodriguez2012-09-211-1/+1