Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use File.join to better integrate fixture_path in fixture_file_upload. | Ben Woosley | 2012-11-26 | 1 | -5/+7 |
| | |||||
* | Refector a bit to remove extra slice iteration and splat call | Carlos Antonio da Silva | 2012-11-24 | 1 | -2/+2 |
| | | | | | | | | | This yields a small bit of performance improvement when building the defaults from constraints, specially considering that it's rather common for constraints to be empty. Also, there's a bit of duplicated code in here that I have to check before extracting. | ||||
* | Use merge! in some places to avoid creating extra hashes | Carlos Antonio da Silva | 2012-11-24 | 2 | -4/+4 |
| | |||||
* | Simplify scope options recovery by using merge! | Carlos Antonio da Silva | 2012-11-24 | 1 | -6/+1 |
| | | | | | | Instead of iterating again over the options and setting one by one, we can just merge the recover hash back to the scope one since all keys match. | ||||
* | Normalize scope recovering :blocks option name | Carlos Antonio da Silva | 2012-11-24 | 1 | -3/+3 |
| | | | | | Use the same :blocks key in the recover hash to revert the scope options later. | ||||
* | Simplify constraints condition in scope when checking for Hash | Carlos Antonio da Silva | 2012-11-24 | 1 | -7/+4 |
| | |||||
* | Allow setting a symbol as path in scope on routes | Guillermo Iguaran | 2012-11-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Was surprising found that this example doesn't work: scope :api do resources :users end and the right form to use it is: scope 'api' do resources :users end I think this should work similary as `namespace` where both are allowed. These two are equivalent: namespace :api do resources :users end namespace 'api' do resources :user end | ||||
* | Remove private partial/template renderer methods | Carlos Antonio da Silva | 2012-11-21 | 3 | -14/+3 |
| | | | | | | Since now these objects are not cached anymore, there's no need to have these private methods, just instantiate each of them in the necessary place. | ||||
* | Merge pull request #8183 from jcoglan/objectless_sessions | Jon Leighton | 2012-11-21 | 2 | -11/+26 |
|\ | | | | | Store FlashHashes in the session as plain hashes | ||||
| * | Store FlashHashes in the session as plain hashes rather than custom objects ↵ | James Coglan | 2012-11-09 | 2 | -11/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Fix session['flash'] deletion condition: it will never be empty?, it will either be nil or a hash with 'discard' and 'flashes' keys. | ||||
* | | Correct the use of params options when given to url_for | Carlos Antonio da Silva | 2012-11-19 | 1 | -1/+1 |
| | | | | | | | | Merge url for tests and add changelog entry for #8233. | ||||
* | | Fix issue with params in url_for | tumayun | 2012-11-19 | 1 | -1/+1 |
| | | | | | | | | | | | | With a "params" argument, the following error is raised: undefined method `reject!` for "":String | ||||
* | | render every partial with a new `PartialRenderer`. | Yves Senn | 2012-11-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | This resolves issues when rendering nested partials. Previously the `PartialRenderer` was reused which led to situations where the state of the renderer was reset. Closes #8197 | ||||
* | | Fix UpgradeSignatureToEncryptionCookieStore doc | Santiago Pastorino | 2012-11-19 | 1 | -9/+4 |
| | | |||||
* | | Removed extra call to #diff in #assert_recognizes. assert_equal calls it for ↵ | Ryan Davis | 2012-11-17 | 1 | -4/+7 |
| | | | | | | | | you and shows the diff. Also delayed message calculation so the cost of the diff on success is now gone. | ||||
* | | Improve UpgradeSignatureToEncryptionCookieStore docs | Santiago Pastorino | 2012-11-16 | 1 | -1/+14 |
| | | | | | | | | | | I suck at English, please help me reviewing this <3 <3 <3 [ci skip] | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 2 | -20/+25 |
|\ \ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | ||||
| * | | update syntax and add note about prompt use of HttpHelpers [ci-skip] | Cesar Carruitero | 2012-11-09 | 1 | -12/+17 |
| | | | |||||
| * | | correct link syntax [ci-skip] | Cesar Carruitero | 2012-11-09 | 1 | -5/+5 |
| | | | |||||
| * | | change rdoc syntax for adecuate render [ci-skip] | Cesar Carruitero | 2012-11-09 | 1 | -1/+1 |
| | | | |||||
| * | | change match to get and add single quotes in routing/redirection [ci-skip] | Cesar Carruitero | 2012-11-08 | 1 | -8/+8 |
| | | | |||||
| * | | Hash Syntax to 1.9 converison | AvnerCohen | 2012-11-07 | 1 | -3/+3 |
| | | | |||||
* | | | Add UpgradeSignatureToEncryptionCookieStore | Santiago Pastorino | 2012-11-16 | 3 | -7/+31 |
| | | | | | | | | | | | | | | | | | | This allows easy upgrading from the old signed Cookie Store <= 3.2 or the deprecated one in 4.0 (the ones that doesn't use key derivation) to the new one that signs using key derivation | ||||
* | | | Call get_cookie to allow the method to be overriden by subclasses | Santiago Pastorino | 2012-11-16 | 1 | -1/+1 |
| | | | |||||
* | | | Add missing env param to get_cookie | Santiago Pastorino | 2012-11-16 | 1 | -1/+1 |
| | | | |||||
* | | | Refactor url methods a bit | Carlos Antonio da Silva | 2012-11-16 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | Use if..else conditions instead of return guards. Use _ for not used arguments when iterating. Set the path variable directly instead of using an empty string and <<. | ||||
* | | | Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`. | Joost Baaij | 2012-11-16 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a list of mime types where template text is not html escaped by default. It prevents `Jack & Joe` from rendering as `Jack & Joe` for the whitelisted mime types. The default whitelist contains text/plain. This follows a whitelist approach where plain text templates are not escaped, and all the others (json, xml) are. The mime type is assumed to be set by the abstract controller. | ||||
* | | | Merge pull request #8112 from rails/encrypted_cookies | Santiago Pastorino | 2012-11-15 | 6 | -45/+111 |
|\ \ \ | | | | | | | | | Encrypted cookies | ||||
| * | | | Disallow ability to use EncryptedCookieJar with DummyKeyGenerator | Santiago Pastorino | 2012-11-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | Developers must set config.secret_key_base in config/initializers/secret_token.rb | ||||
| * | | | Rename secret_token_key to secret_key_base | Santiago Pastorino | 2012-11-03 | 1 | -3/+3 |
| | | | | |||||
| * | | | Move ensure_secret_secure to DummyKeyGenerator | Santiago Pastorino | 2012-11-03 | 1 | -24/+0 |
| | | | | |||||
| * | | | Allow users to change the default salt if they want, shouldn't be necessary | Santiago Pastorino | 2012-11-03 | 3 | -13/+29 |
| | | | | |||||
| * | | | Use derived keys everywhere, http_authentication was missing it | Santiago Pastorino | 2012-11-03 | 1 | -3/+2 |
| | | | | |||||
| * | | | Add encrypted cookie store | Santiago Pastorino | 2012-11-03 | 2 | -7/+25 |
| | | | | |||||
| * | | | Add cookie.encrypted which returns an EncryptedCookieJar | Santiago Pastorino | 2012-11-03 | 1 | -0/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -19/+23 |
| | |/ | |/| | |||||
* | | | 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] |