Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix message about include_blank option. | Steve Klabnik + Katrina Owen | 2012-11-09 | 1 | -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 will | Aaron Patterson | 2012-11-09 | 1 | -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/gemspec | Rafael Mendonça França | 2012-11-08 | 1 | -13/+15 |
|\ | | | | | Reformat gemspec | ||||
| * | Clean up gemspecs | Vinny Diehl | 2012-11-08 | 1 | -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 Leighton | 2012-11-09 | 3 | -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 #tap | Carlos Antonio da Silva | 2012-11-08 | 1 | -3/+4 |
| | | |||||
* | | Merge pull request #8017 from jcoglan/objectless_sessions | Jon Leighton | 2012-11-08 | 3 | -10/+46 |
|\ \ | | | | | | | Store FlashHashes in the session as plain hashes | ||||
| * | | Store FlashHashes in the session as plain hashes rather than custom objects ↵ | James Coglan | 2012-11-03 | 3 | -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_engines | Rafael Mendonça França | 2012-11-08 | 2 | -3/+6 |
|\ \ \ | |_|/ |/| | | handle trailing slash with engines (test case for #7842) | ||||
| * | | routing prefix slash replacement is no longer necessary | Yves Senn | 2012-11-04 | 1 | -3/+1 |
| | | | |||||
| * | | test case to lock down the behavior of #7842 | Yves Senn | 2012-11-04 | 1 | -0/+5 |
| | | | |||||
* | | | Add CHANGELOG entry for #8108 on master too. | Rafael Mendonça França | 2012-11-08 | 1 | -0/+16 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Set @permitted on new instance when slicing parameters hash | Benjamin Quorning | 2012-11-06 | 1 | -1/+3 |
| | | | |||||
* | | | Test that permitted? is sticky on accessors, mutators, and merges | Benjamin Quorning | 2012-11-06 | 1 | -0/+24 |
| | | | |||||
* | | | Test that not permitted is sticky on #except | Benjamin Quorning | 2012-11-06 | 1 | -0/+1 |
| | | | |||||
* | | | Current tests are testing stickiness of non-permitted parameters | Benjamin Quorning | 2012-11-06 | 1 | -3/+3 |
| | | | |||||
* | | | Fix buggy tests | Benjamin Quorning | 2012-11-06 | 1 | -4/+4 |
| | | | |||||
* | | | Add ensure block to make sure the state is properly restored | Carlos Antonio da Silva | 2012-11-04 | 2 | -2/+2 |
|/ / | |||||
* / | Remove #permitted attr accessor from Parameters | Carlos Antonio da Silva | 2012-11-03 | 1 | -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 :index | Daniel Fox, Grant Hutchins & Trace Wax | 2012-11-02 | 3 | -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 routes | Santiago Pastorino | 2012-11-02 | 2 | -0/+5 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-03 | 54 | -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 Dev | 2012-11-03 | 1 | -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 docs | AvnerCohen | 2012-10-31 | 18 | -169/+169 |
| | | |||||
| * | Hash Syntax to 1.9 related changes | AvnerCohen | 2012-10-29 | 20 | -346/+346 |
| | | |||||
| * | dont encourage AC::Parameters#permit_all_parameters usage [ci skip] | Francesco Rodriguez | 2012-10-28 | 1 | -21/+1 |
| | | |||||
| * | Multiple changes to 1,9 hash syntax | AvnerCohen | 2012-10-27 | 15 | -77/+77 |
| | | |||||
| * | fix error in AssertTagHelper documentation [ci skip] | Cesar Carruitero | 2012-10-21 | 1 | -5/+5 |
| | | |||||
| * | update AssetTagHelper documentation [ci skip] | Cesar Carruitero | 2012-10-21 | 1 | -21/+21 |
| | | |||||
| * | fix StrongParameters example [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -1/+1 |
| | | |||||
* | | Add test to avoid regression of 1bfc5b4 | Rafael Mendonça França | 2012-11-02 | 1 | -0/+8 |
| | | |||||
* | | Revert "Merge pull request #7668 from Draiken/fix_issue_6497" | Rafael Mendonça França | 2012-11-02 | 3 | -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 variable | Sergey Nartimov | 2012-11-01 | 1 | -6/+4 |
| | | | | | | | | There is no need in additional `@calculated_ip` instance variable. | ||||
* | | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, now ↵ | Nikita Afanasenko | 2012-11-01 | 3 | -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 helpers | Carlos Antonio da Silva | 2012-11-01 | 1 | -2/+7 |
| | | | | | | | | Closes #8091 | ||||
* | | No need for the debugger | David Heinemeier Hansson | 2012-10-31 | 1 | -1/+0 |
| | | |||||
* | | Allow #permit to take its list of permitted parameters as an array | David Heinemeier Hansson | 2012-10-31 | 2 | -1/+6 |
| | | |||||
* | | Revert "if format is unknown NullMimeTypeObject is returned" | Guillermo Iguaran | 2012-10-31 | 3 | -28/+2 |
| | | | | | | | | This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e. | ||||
* | | if format is unknown NullMimeTypeObject is returned | Angelo capilleri | 2012-10-31 | 3 | -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 optional | Alexey Gaziev | 2012-10-30 | 12 | -22/+20 |
| | | |||||
* | | Fix failing tests and use new hash style in deprecation messages | Carlos Antonio da Silva | 2012-10-29 | 6 | -28/+28 |
| | | |||||
* | | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 11 | -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 and | Rafael Mendonça França | 2012-10-27 | 2 | -8/+10 |
| | | | | | | | | | | | | button_to_function Point the the Unobtrusive JavaScript secion in the JavaScript guide | ||||
* | | cleanup, remove trailing whitespace within actionpack | Yves Senn | 2012-10-27 | 11 | -17/+17 |
| | | |||||
* | | Add missing require for minitest assertions. Breaks calling 'app' in console ↵ | Jeremy Kemper | 2012-10-25 | 1 | -0/+1 |
| | | | | | | | | otherwise. See 94248ffe1e6f815b8ffab4eb752b60c1e4459d25. | ||||
* | | Merge pull request #8030 from calebthompson/fix-ternary | Rafael Mendonça França | 2012-10-25 | 1 | -2/+5 |
|\ \ | | | | | | | Fix gratuitous use of ternary operator | ||||
| * | | Fix gratuitous use of ternary operator | Caleb Thompson | 2012-10-25 | 1 | -2/+5 |
| | | | |||||
* | | | remain backwards compatible, exception can be constructed with no arguments | Aaron Patterson | 2012-10-25 | 1 | -1/+3 |
|/ / | |||||
* | | give access to the original exception raised in case of a parse error | Aaron Patterson | 2012-10-25 | 3 | -2/+23 |
| | | |||||
* | | do not lose backtrace information from the raised exception | Aaron Patterson | 2012-10-25 | 2 | -14/+11 |
| | |