aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13307 from akshay-vishnoi/typoRafael Mendonça França2013-12-151-1/+1
|\
| * Spelling and Grammar check [ci skip]Akshay Vishnoi2013-12-161-1/+1
* | Update secret_key_base Docsrobertomiranda2013-12-152-10/+11
* | Fix syntax error in redirect_to examplePhilipe Fatio2013-12-141-1/+1
* | Merge pull request #13293 from akshay-vishnoi/typoCarlos Antonio da Silva2013-12-124-5/+5
|\|
| * Spelling and Grammar checksAkshay Vishnoi2013-12-124-5/+5
* | Merge pull request #13290 from strzalek/inline-syntax-docsRafael Mendonça França2013-12-122-0/+17
|\ \ | |/ |/|
| * Variants inline syntax documentation [ci skip]Łukasz Strzałkowski2013-12-122-0/+17
* | Changelog improvements [ci skip]Carlos Antonio da Silva2013-12-121-4/+6
|/
* Merge pull request #13288 from dvsuresh/fix_typoDamien Mathieu2013-12-121-1/+1
|\
| * Fix typo in action_controller responder.rbdvsuresh2013-12-121-1/+1
* | Merge pull request #13284 from aayushkhandelwal11/typos_correctedGodfrey Chan2013-12-111-1/+1
|\ \ | |/ |/|
| * typos rectified [ci skip]Aayush khandelwal2013-12-121-1/+1
* | Update CHANGELOG entry for Session#fetchTrent Ogren2013-12-111-3/+1
* | Make ActionDispatch::Request::Session#fetch behave like Hash#fetchTrent Ogren2013-12-112-11/+10
|/
* Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-103-2/+18
* Inline variants syntaxŁukasz Strzałkowski2013-12-103-3/+63
* Simplify @responses hash initializationŁukasz Strzałkowski2013-12-101-1/+2
* Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a l...David Heinemeier Hansson2013-12-082-28/+10
* Merge pull request #13235 from strzalek/variants-inlineDavid Heinemeier Hansson2013-12-082-10/+28
|\
| * Inline variants syntaxŁukasz Strzałkowski2013-12-082-9/+27
| * Simplify @responses hash initializationŁukasz Strzałkowski2013-12-081-1/+1
* | Require action_view explicitly in AC::BaseŁukasz Strzałkowski2013-12-082-0/+2
|/
* Variants can be declared without a block to signify their presence in the con...David Heinemeier Hansson2013-12-073-2/+5
* Allow code execution in case no variant has been set with variant.noneDavid Heinemeier Hansson2013-12-072-4/+21
* Fixed test for Mime::VCFArun Agrawal2013-12-061-3/+3
* Add Mime::Type.register "text/vcard", :vcf to the default list of mime typesDavid Heinemeier Hansson2013-12-052-0/+5
* Merge pull request #13189 from strzalek/retain-ap-av-depJeremy Kemper2013-12-055-19/+6
|\
| * Remove missing integration points of AV extractionCarlos Antonio da Silva2013-12-052-3/+1
| * Retain ActionPack dependency on ActionViewŁukasz Strzałkowski2013-12-053-16/+5
* | add missing CHANGELOG entry for d8c6f52. [ci skip]Yves Senn2013-12-051-0/+5
* | Escalate missing error when :raise is trueShota Fukumori (sora_h)2013-12-051-0/+7
* | Update changelog [ci skip]Rafael Mendonça França2013-12-041-2/+2
* | remove nil in NullType#ref.Angelo capilleri2013-12-041-3/+1
* | Improve a couple exception messages related to variants and mime typesCarlos Antonio da Silva2013-12-033-15/+19
* | Add nodoc to added VariantFilter classCarlos Antonio da Silva2013-12-031-3/+3
|/
* Action Pack VariantsŁukasz Strzałkowski2013-12-049-6/+169
* Change deep_munge call to avoid deprecation warningCarlos Antonio da Silva2013-12-031-2/+2
* Merge branch 'master-sec'Aaron Patterson2013-12-032-2/+17
|\
| * Deep Munge the parameters for GET and POSTMichael Koziarski2013-12-022-2/+17
* | Changelog improvements [ci skip]Carlos Antonio da Silva2013-12-031-5/+5
* | Convert Mime::NullType in a singletonGuillermo Iguaran2013-12-031-1/+4
* | Cleanups in comment about conditionalGuillermo Iguaran2013-12-031-1/+2
* | Merge branch 'format_localized_template' of https://github.com/acapilleri/railsGuillermo Iguaran2013-12-034-1/+22
|\ \ | |/ |/|
| * Fix header Content-Type: #<Mime::NullType:...> in localized templateAngelo capilleri2013-12-034-1/+22
* | Merge pull request #12123 from aredondo/masterCarlos Antonio da Silva2013-12-021-0/+8
|\ \
| * | Add regression test for IpSpoofAttackError issueAlvaro Redondo2013-09-031-0/+8
* | | Remove deprecated cattr_* requiresGenadi Samokovarov2013-12-034-4/+4
* | | Try to escape each part of a path redirect route correctlyAndrew White2013-12-023-8/+41
* | | [ci skip] Removing some gender sensitive object pronounsTejas Dinkar2013-12-021-2/+2