Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8112 from rails/encrypted_cookies | Santiago Pastorino | 2012-11-15 | 4 | -11/+38 |
|\ | | | | | Encrypted cookies | ||||
| * | Move ensure_secret_secure to DummyKeyGenerator | Santiago Pastorino | 2012-11-03 | 1 | -1/+1 |
| | | |||||
| * | Allow users to change the default salt if they want, shouldn't be necessary | Santiago Pastorino | 2012-11-03 | 1 | -1/+4 |
| | | |||||
| * | Use derived keys everywhere, http_authentication was missing it | Santiago Pastorino | 2012-11-03 | 1 | -1/+3 |
| | | |||||
| * | Add cookie.encrypted which returns an EncryptedCookieJar | Santiago Pastorino | 2012-11-03 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | How to use it? cookies.encrypted[:discount] = 45 => Set-Cookie: discount=ZS9ZZ1R4cG1pcUJ1bm80anhQang3dz09LS1mbDZDSU5scGdOT3ltQ2dTdlhSdWpRPT0%3D--ab54663c9f4e3bc340c790d6d2b71e92f5b60315; path=/ cookies.encrypted[:discount] => 45 | ||||
| * | Sign cookies using key deriver | Santiago Pastorino | 2012-11-03 | 3 | -9/+16 |
| | | |||||
* | | Merge pull request #8222 from marcandre/avoid_slash | Rafael Mendonça França | 2012-11-14 | 1 | -0/+5 |
|\ \ | | | | | | | 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 | -0/+5 |
| | | | |||||
* | | | start using options object | Aaron Patterson | 2012-11-13 | 1 | -1/+1 |
| | | | |||||
* | | | Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag ↵ | Aaron Patterson | 2012-11-12 | 1 | -0/+1 |
|/ / | | | | | | | this file with us-ascii | ||||
* | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions" | Jon Leighton | 2012-11-09 | 1 | -21/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge pull request #8017 from jcoglan/objectless_sessions | Jon Leighton | 2012-11-08 | 1 | -0/+21 |
|\ \ | | | | | | | 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 | 1 | -0/+21 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+5 |
|\ \ | | | | | | | handle trailing slash with engines (test case for #7842) | ||||
| * | | test case to lock down the behavior of #7842 | Yves Senn | 2012-11-04 | 1 | -0/+5 |
| |/ | |||||
* | | 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 | 1 | -1/+1 |
|/ | |||||
* | Support :multiple option on input tags with :index | Daniel Fox, Grant Hutchins & Trace Wax | 2012-11-02 | 1 | -0/+13 |
| | | | | | 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. | ||||
* | 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 | 1 | -7/+0 |
| | | | | | | | | | | | | | | 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 | ||||
* | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, now ↵ | Nikita Afanasenko | 2012-11-01 | 1 | -0/+34 |
| | | | | | | | 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 | 1 | -0/+5 |
| | |||||
* | Revert "if format is unknown NullMimeTypeObject is returned" | Guillermo Iguaran | 2012-10-31 | 1 | -11/+1 |
| | | | | This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e. | ||||
* | if format is unknown NullMimeTypeObject is returned | Angelo capilleri | 2012-10-31 | 1 | -1/+11 |
| | | | | | | | | | | 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. | ||||
* | Fix failing tests and use new hash style in deprecation messages | Carlos Antonio da Silva | 2012-10-29 | 2 | -12/+12 |
| | |||||
* | Improve the deprecation message of link_to_function and | Rafael Mendonça França | 2012-10-27 | 1 | -6/+6 |
| | | | | | | button_to_function Point the the Unobtrusive JavaScript secion in the JavaScript guide | ||||
* | cleanup, remove trailing whitespace within actionpack | Yves Senn | 2012-10-27 | 9 | -15/+15 |
| | |||||
* | give access to the original exception raised in case of a parse error | Aaron Patterson | 2012-10-25 | 1 | -0/+14 |
| | |||||
* | do not lose backtrace information from the raised exception | Aaron Patterson | 2012-10-25 | 1 | -4/+5 |
| | |||||
* | check_box value can be not only an object of Array class | Vasiliy Ermolovich | 2012-10-20 | 1 | -0/+6 |
| | | | | there is a chance that `value` is a Set or an object that reponses to `include?` method so let's handle this case | ||||
* | Add i18n scope to disance_of_time_in_words. | Steve Klabnik | 2012-10-19 | 1 | -10/+19 |
| | | | | This fixes #733. | ||||
* | add test for fetch with a block | Aaron Patterson | 2012-10-18 | 1 | -0/+4 |
| | |||||
* | prefer composition over inheritence | Aaron Patterson | 2012-10-18 | 1 | -0/+16 |
| | |||||
* | Merge pull request #7975 from butcher/extend_date_select_helper_functionality | Rafael Mendonça França | 2012-10-18 | 1 | -0/+16 |
|\ | | | | | | | | | | | | | Extend date_select helper functionality. Conflicts: actionpack/CHANGELOG.md | ||||
| * | Extend date_select helper functionality. | Pavel Nikitin | 2012-10-18 | 1 | -0/+16 |
| | | |||||
* | | Permit string and float values in the multiparameter attributes | Rafael Mendonça França | 2012-10-18 | 1 | -9/+14 |
| | | |||||
* | | use the tmp filesystem rather than our own thing. | Aaron Patterson | 2012-10-17 | 1 | -5/+9 |
|/ | |||||
* | Ignore asset url query string or anchor when appending extensions and ↵ | Joshua Peek | 2012-10-15 | 1 | -1/+18 |
| | | | | computing public path | ||||
* | Extract compute_asset_extname and allow extname to be disabled | Joshua Peek | 2012-10-15 | 1 | -6/+15 |
| | |||||
* | Merge branch 'master' into asset-path-helper | Joshua Peek | 2012-10-15 | 1 | -5/+1 |
|\ | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb | ||||
| * | Minor cleanup, helper method was only used once | Ayrton De Craene | 2012-10-15 | 1 | -5/+1 |
| | | |||||
* | | :fire: Rails asset id support | Joshua Peek | 2012-10-15 | 1 | -80/+1 |
| | | |||||
* | | Allow asset url config to be undefined | Joshua Peek | 2012-10-13 | 1 | -0/+41 |
| | | |||||
* | | Add a few more compute_asset_path tests | Joshua Peek | 2012-10-13 | 1 | -0/+8 |
| | | |||||
* | | JAVASCRIPTS_DIR, STYLESHEETS_DIR, ASSETS_DIR don't even exist anymore | Joshua Peek | 2012-10-12 | 1 | -28/+0 |
| | |