Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8222 from marcandre/avoid_slash | Rafael Mendonça França | 2012-11-14 | 1 | -1/+1 |
|\ | | | | | Avoid using Integer#/, as it is redefined by the 'mathn' stdlib | ||||
| * | Avoid using Integer#/, as it is redefined by the 'mathn' stdlib | Marc-Andre Lafortune | 2012-11-14 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #8218 from DawidJanczak/form-tag-doc | Carlos Antonio da Silva | 2012-11-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | [ci skip] Correct examples for form_tag helper. Conflicts: actionpack/lib/action_view/helpers/form_tag_helper.rb | ||||
* | | lazily calculate name in the options object | Aaron Patterson | 2012-11-13 | 1 | -14/+18 |
| | | |||||
* | | move include calculation to include method on the options object | Aaron Patterson | 2012-11-13 | 1 | -9/+24 |
| | | |||||
* | | model name is lazily evaluated in the options object | Aaron Patterson | 2012-11-13 | 1 | -27/+37 |
| | | |||||
* | | move the controller class to the options object | Aaron Patterson | 2012-11-13 | 1 | -9/+12 |
| | | |||||
* | | attribute_names will always return a list, so just use any? | Aaron Patterson | 2012-11-13 | 1 | -1/+1 |
| | | |||||
* | | wrap up hash conversion in the constructor | Aaron Patterson | 2012-11-13 | 1 | -5/+5 |
| | | |||||
* | | use the options object in the wrapper defaults | Aaron Patterson | 2012-11-13 | 1 | -13/+12 |
| | | |||||
* | | start using options object | Aaron Patterson | 2012-11-13 | 1 | -9/+20 |
| | | |||||
* | | only do hash lookups on options once | Aaron Patterson | 2012-11-13 | 1 | -13/+15 |
| | | |||||
* | | replace present? with any? to reduce dependency on AS | Aaron Patterson | 2012-11-13 | 2 | -1/+2 |
|/ | |||||
* | Use get in the redirection doc examples | Carlos Antonio da Silva | 2012-11-09 | 1 | -7/+7 |
| | | | | | | | get is the most common usage, and match without an explicit verb was disallowed in 56cdc81c08b1847c5c1f699810a8c3b9ac3715a6. [ci skip] | ||||
* | Merge pull request #8158 from steveklabnik/deprecate_diff | Carlos Antonio da Silva | 2012-11-09 | 1 | -3/+1 |
|\ | | | | | Deprecate Hash#diff. | ||||
| * | Deprecate Hash#diff. | Steve Klabnik | 2012-11-09 | 1 | -3/+1 |
| | | | | | | | | | | | | It's no longer used in Rails any more. See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more | ||||
* | | Removing duplication in callback normalization. | Steve Klabnik | 2012-11-09 | 1 | -7/+8 |
|/ | | | | These two things were 100% identical. | ||||
* | Merge pull request #8151 from nashby/forwardable | Carlos Antonio da Silva | 2012-11-09 | 1 | -20/+2 |
|\ | | | | | delegate PathSet's enumerator methods | ||||
| * | delegate PathSet's enumerator methods | Vasiliy Ermolovich | 2012-11-09 | 1 | -20/+2 |
| | | |||||
* | | 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> | ||||
* | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions" | Jon Leighton | 2012-11-09 | 2 | -26/+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 | 2 | -10/+25 |
|\ \ | | | | | | | 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 | 2 | -10/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -3/+1 |
|\ \ \ | |_|/ |/| | | 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 |
| | | | |||||
* | | | Set @permitted on new instance when slicing parameters hash | Benjamin Quorning | 2012-11-06 | 1 | -1/+3 |
| | | | |||||
* | | | Add ensure block to make sure the state is properly restored | Carlos Antonio da Silva | 2012-11-04 | 1 | -1/+1 |
|/ / | |||||
* / | 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 | 2 | -6/+4 |
| | | | | | 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 | 1 | -0/+1 |
| | |||||
* | 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 |
| | | |||||
* | | Revert "Merge pull request #7668 from Draiken/fix_issue_6497" | Rafael Mendonça França | 2012-11-02 | 1 | -1/+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 | 1 | -1/+7 |
| | | | | | | | | | | | | | | appends). Now `BestStandardsSupport` middleware appends it's `X-UA-Compatible` value to app's value. Also test for `BestStandardsSupport` middleware added. | ||||
* | | Allow #permit to take its list of permitted parameters as an array | David Heinemeier Hansson | 2012-10-31 | 1 | -1/+1 |
| | | |||||
* | | Revert "if format is unknown NullMimeTypeObject is returned" | Guillermo Iguaran | 2012-10-31 | 1 | -12/+1 |
| | | | | | | | | This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e. | ||||
* | | if format is unknown NullMimeTypeObject is returned | Angelo capilleri | 2012-10-31 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | 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 | 4 | -16/+16 |
| | | |||||
* | | 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. |