aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-101-1/+2
* Inline variants syntaxŁukasz Strzałkowski2013-12-101-2/+24
* 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-081-15/+9
* Merge pull request #13235 from strzalek/variants-inlineDavid Heinemeier Hansson2013-12-081-9/+15
|\
| * Inline variants syntaxŁukasz Strzałkowski2013-12-081-8/+14
| * 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-071-1/+3
* Allow code execution in case no variant has been set with variant.noneDavid Heinemeier Hansson2013-12-071-4/+5
* Add Mime::Type.register "text/vcard", :vcf to the default list of mime typesDavid Heinemeier Hansson2013-12-051-0/+1
* Merge pull request #13189 from strzalek/retain-ap-av-depJeremy Kemper2013-12-052-15/+4
|\
| * Retain ActionPack dependency on ActionViewŁukasz Strzałkowski2013-12-052-15/+4
* | 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-044-5/+71
* Change deep_munge call to avoid deprecation warningCarlos Antonio da Silva2013-12-031-2/+2
* Merge branch 'master-sec'Aaron Patterson2013-12-031-2/+2
|\
| * Deep Munge the parameters for GET and POSTMichael Koziarski2013-12-021-2/+2
* | 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-031-1/+1
|\ \ | |/ |/|
| * Fix header Content-Type: #<Mime::NullType:...> in localized templateAngelo capilleri2013-12-031-1/+1
* | Remove deprecated cattr_* requiresGenadi Samokovarov2013-12-034-4/+4
* | Try to escape each part of a path redirect route correctlyAndrew White2013-12-021-8/+25
* | [ci skip] Removing some gender sensitive object pronounsTejas Dinkar2013-12-021-2/+2
* | Use genderless pronouns in API docsGuillermo Iguaran2013-12-011-1/+1
|/
* Better error message for typos in assert_response argument.Victor Costan2013-11-251-0/+3
* Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-241-1/+1
|\
| * Change syntax format for example returned valuesPrem Sichanugrist2013-11-111-1/+1
* | Revert "Merge pull request #12990 from vipulnsward/remove_visualizer_param"Rafael Mendonça França2013-11-211-1/+1
* | Remove unused param `title`to `TransitionTable#visualizer`Vipul A M2013-11-221-1/+1
* | Fix for routes taskSıtkı Bağdat2013-11-211-1/+2
* | Avoid hash lookups for building an array of required defaultsCarlos Antonio da Silva2013-11-151-2/+3
* | Get rid of useless temp variableCarlos Antonio da Silva2013-11-151-2/+1
* | Set values instead of building hashes with single values for mergingCarlos Antonio da Silva2013-11-151-2/+2
* | Take Hash with options inside Array in #url_forAndrey Ognevsky2013-11-151-0/+2
* | Revert "Used Yield instead of block.call" -- this causes all of atom_feed_hel...David Heinemeier Hansson2013-11-141-2/+2
* | Merge pull request #12892 from akshay-vishnoi/refactorRafael Mendonça França2013-11-141-9/+12
|\ \
| * | avoiding next statementsAkshay Vishnoi2013-11-151-9/+12
* | | Merge pull request #12889 from kuldeepaggarwal/speed_upsRafael Mendonça França2013-11-141-2/+2
|\ \ \ | |/ / |/| |
| * | Used Yield instead of block.callKuldeep Aggarwal2013-11-151-2/+2
| |/
* | class methods moved to already defined class<<self blockAkshay Vishnoi2013-11-151-6/+6
* | #presence usedAkshay Vishnoi2013-11-141-5/+1
* | Merge pull request #12838 from strzalek/remove_mime_type_order_varGuillermo Iguaran2013-11-101-4/+3
|\ \
| * | Remove order attribute from collectorLukasz Strzalkowski2013-11-101-4/+3
| |/
* | Merge pull request #12740 from gaurish/patch-1Rafael Mendonça França2013-11-101-2/+4
|\ \ | |/ |/|
| * Improve Errors when Controller Name or Action isn't specfiedGaurish Sharma2013-11-051-2/+4
* | calculate the ivars to remove in advance as a set and cache them in aAaron Patterson2013-11-062-11/+12