aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #8151 from nashby/forwardableCarlos Antonio da Silva2012-11-091-20/+2
|\ \ \ | | | | | | | | delegate PathSet's enumerator methods
| * | | delegate PathSet's enumerator methodsVasiliy Ermolovich2012-11-091-20/+2
| | | |
* | | | Fix message about include_blank option.Steve Klabnik + Katrina Owen2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/cb7d19b66badfbd1846c195913419c331701074e#commitcomment-2127148.
* | | | implement to_a and to_ary so that the Array() call in template.rb willAaron Patterson2012-11-091-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not raise so many exceptions: https://github.com/rails/rails/blob/master/actionpack/lib/action_view/template.rb#L126 irb(main):001:0> class Foo; def method_missing(*args); super; end end => nil irb(main):002:0> $DEBUG = true => true irb(main):003:0> Array(Foo.new) Exception `NoMethodError' at (irb):1 - undefined method `to_ary' for #<Foo:0x007f854390e488> Exception `NoMethodError' at (irb):1 - undefined method `to_a' for #<Foo:0x007f854390e488> => [#<Foo:0x007f854390e488>] irb(main):004:0>
* | | | Merge pull request #8147 from gbchaosmaster/gemspecRafael Mendonça França2012-11-081-13/+15
|\ \ \ \ | | | | | | | | | | Reformat gemspec
| * | | | Clean up gemspecsVinny Diehl2012-11-081-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes.
* | | | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-093-47/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 36376560fdd02f955ae3bf6b7792b784443660ad, reversing changes made to 3148ed9a4bb7efef30b846dc945d73ceebcc3f0f. Conflicts: actionpack/lib/action_dispatch/middleware/flash.rb Reason: it broke Sam's CI https://github.com/rails/rails/pull/8017#issuecomment-10210655
* | | | | Remove free usage of #tapCarlos Antonio da Silva2012-11-081-3/+4
| | | | |
* | | | | Merge pull request #8017 from jcoglan/objectless_sessionsJon Leighton2012-11-083-10/+46
|\ \ \ \ \ | | | | | | | | | | | | Store FlashHashes in the session as plain hashes
| * | | | | Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-033-10/+46
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with unstable class names and instance variables. Refactor FlashHash to take values for its ivars in the constructor, to pretty up FlashHash.from_session_value. Remove stale comment on FlashHash: it is no longer Marshaled in the session so we can change its implementation. Remove blank lines I introduced in controller/test_case.rb. Unit tests for FlashHash#to_session_value. Put in a compatibility layer to accept FlashHash serializations from Rails 3.0+. Test that Rails 3.2 session flashes are correctly converted to the new format. Remove code path for processing Rails 3.0 FlashHashes since they can no longer deserialize.
* | | | | Merge pull request #8115 from senny/7842_handle_trailing_slash_with_enginesRafael Mendonça França2012-11-082-3/+6
|\ \ \ \ \ | |_|/ / / |/| | | | handle trailing slash with engines (test case for #7842)
| * | | | routing prefix slash replacement is no longer necessaryYves Senn2012-11-041-3/+1
| | | | |
| * | | | test case to lock down the behavior of #7842Yves Senn2012-11-041-0/+5
| | | | |
* | | | | Add CHANGELOG entry for #8108 on master too.Rafael Mendonça França2012-11-081-0/+16
| |_|/ / |/| | | | | | | | | | | [ci skip]
* | | | Set @permitted on new instance when slicing parameters hashBenjamin Quorning2012-11-061-1/+3
| | | |
* | | | Test that permitted? is sticky on accessors, mutators, and mergesBenjamin Quorning2012-11-061-0/+24
| | | |
* | | | Test that not permitted is sticky on #exceptBenjamin Quorning2012-11-061-0/+1
| | | |
* | | | Current tests are testing stickiness of non-permitted parametersBenjamin Quorning2012-11-061-3/+3
| | | |
* | | | Fix buggy testsBenjamin Quorning2012-11-061-4/+4
| | | |
* | | | Add ensure block to make sure the state is properly restoredCarlos Antonio da Silva2012-11-042-2/+2
|/ / /
* / / Remove #permitted attr accessor from ParametersCarlos Antonio da Silva2012-11-031-1/+0
|/ / | | | | | | | | There is no need to expose this accessor since we already have the query method #permitted? that should handle this purpose.
* | Support :multiple option on input tags with :indexDaniel Fox, Grant Hutchins & Trace Wax2012-11-023-6/+17
| | | | | | | | | | When you have an explicit index set, then when you build an input tag with :multiple => true, it doesn't add [] to the end of its name, although it should.
* | Clear url helpers when reloading routesSantiago Pastorino2012-11-022-0/+5
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-0354-609/+609
|\ | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb activerecord/lib/active_record/attribute_methods.rb guides/source/working_with_javascript_in_rails.md
| * Revert "dont encourage AC::Parameters#permit_all_parameters usage [ci skip]"Vijay Dev2012-11-031-1/+21
| | | | | | | | | | | | | | | | This reverts commit cd17ee5598411728747011566abf6779166be9d3. Reason: Let's note that this is discouraged, not remove the docs [ci skip]
| * 1.9 hash syntax changes to docsAvnerCohen2012-10-3118-169/+169
| |
| * Hash Syntax to 1.9 related changesAvnerCohen2012-10-2920-346/+346
| |
| * dont encourage AC::Parameters#permit_all_parameters usage [ci skip]Francesco Rodriguez2012-10-281-21/+1
| |
| * Multiple changes to 1,9 hash syntaxAvnerCohen2012-10-2715-77/+77
| |
| * fix error in AssertTagHelper documentation [ci skip]Cesar Carruitero2012-10-211-5/+5
| |
| * update AssetTagHelper documentation [ci skip]Cesar Carruitero2012-10-211-21/+21
| |
| * fix StrongParameters example [ci skip]Francesco Rodriguez2012-10-211-1/+1
| |
* | Add test to avoid regression of 1bfc5b4Rafael Mendonça França2012-11-021-0/+8
| |
* | Revert "Merge pull request #7668 from Draiken/fix_issue_6497"Rafael Mendonça França2012-11-023-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4ad0ebe7a6b17658bddfeb996e3c34835b75623, reversing changes made to 8b2cbb3a832101f0e672ee309beca0f8c555b292. Conflicts: actionpack/CHANGELOG.md REASON: This added introduced a bug when you have a shorthand route inside a nested namespace. See https://github.com/rafaelfranca/rails/commit/281367eb770faf8077c1fd6194188e92ed1637a1
* | memoize calculated ip without additional variableSergey Nartimov2012-11-011-6/+4
| | | | | | | | There is no need in additional `@calculated_ip` instance variable.
* | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, now ↵Nikita Afanasenko2012-11-013-1/+46
| | | | | | | | | | | | | | appends). Now `BestStandardsSupport` middleware appends it's `X-UA-Compatible` value to app's value. Also test for `BestStandardsSupport` middleware added.
* | Add test to ensure data attributes are properly escaped with tag helpersCarlos Antonio da Silva2012-11-011-2/+7
| | | | | | | | Closes #8091
* | No need for the debuggerDavid Heinemeier Hansson2012-10-311-1/+0
| |
* | Allow #permit to take its list of permitted parameters as an arrayDavid Heinemeier Hansson2012-10-312-1/+6
| |
* | Revert "if format is unknown NullMimeTypeObject is returned"Guillermo Iguaran2012-10-313-28/+2
| | | | | | | | This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e.
* | if format is unknown NullMimeTypeObject is returnedAngelo capilleri2012-10-313-2/+28
| | | | | | | | | | | | | | | | | | | | If a unknown format is passed in a request, the methods html?, xml?, json? ...etc Nil Exception. This patch add a class NullMimeTypeObject, that is returned when request.format is unknown and it responds false to the methods that ends with '?'. It refers to #7837, not fixes because it's not considered a improvement not a bug.
* | Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-3012-22/+20
| |
* | Fix failing tests and use new hash style in deprecation messagesCarlos Antonio da Silva2012-10-296-28/+28
| |
* | Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-2911-22/+45
| | | | | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly.
* | Improve the deprecation message of link_to_function andRafael Mendonça França2012-10-272-8/+10
| | | | | | | | | | | | button_to_function Point the the Unobtrusive JavaScript secion in the JavaScript guide
* | cleanup, remove trailing whitespace within actionpackYves Senn2012-10-2711-17/+17
| |
* | Add missing require for minitest assertions. Breaks calling 'app' in console ↵Jeremy Kemper2012-10-251-0/+1
| | | | | | | | otherwise. See 94248ffe1e6f815b8ffab4eb752b60c1e4459d25.
* | Merge pull request #8030 from calebthompson/fix-ternaryRafael Mendonça França2012-10-251-2/+5
|\ \ | | | | | | Fix gratuitous use of ternary operator
| * | Fix gratuitous use of ternary operatorCaleb Thompson2012-10-251-2/+5
| | |
* | | remain backwards compatible, exception can be constructed with no argumentsAaron Patterson2012-10-251-1/+3
|/ /