aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Add explicit opt-out for fragment cache digestingDrew Ulmer2012-11-253-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | This add support for sending an explicit opt-out of the "Russian-doll" cache digest feature on a case-by-case basis. This is useful when cache- expiration needs to be performed manually and it would be otherwise difficult to know the exact name of a digested cache key. More information: https://github.com/rails/cache_digests/pull/16
* | | Merge pull request #8302 from roberto/assert_template_empty_stringCarlos Antonio da Silva2012-11-253-1/+19
|\ \ \ | |/ / |/| | assert_template("") will now fail no matter whether a template has been rendered or not.
| * | `assert_template` fails with empty string.Roberto Soares2012-11-233-9/+12
| | |
| * | `assert_template` fails with empty string when a template has been renderedRoberto Soares2012-11-233-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | For instance, it prevents false positive in this case: file = nil get :index assert_template("#{file}")
* | | Merge pull request #8306 from senny/documentation_for_hidden_field_idCarlos Antonio da Silva2012-11-241-0/+5
|\ \ \ | |_|/ |/| | Document :hidden_field_id option for fields_for [ci skip]
| * | document :hidden_field_id option for fields_forYves Senn2012-11-241-0/+5
| | |
* | | Refector a bit to remove extra slice iteration and splat callCarlos Antonio da Silva2012-11-241-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 hashesCarlos Antonio da Silva2012-11-242-4/+4
| | |
* | | Simplify scope options recovery by using merge!Carlos Antonio da Silva2012-11-241-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 nameCarlos Antonio da Silva2012-11-241-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 HashCarlos Antonio da Silva2012-11-241-7/+4
| |/ |/|
* | Indent changelog markdown code to highlight correctlyCarlos Antonio da Silva2012-11-221-11/+11
| | | | | | | | [ci skip]
* | Allow setting a symbol as path in scope on routesGuillermo Iguaran2012-11-213-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 methodsCarlos Antonio da Silva2012-11-213-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_sessionsJon Leighton2012-11-213-11/+47
|\ \ | | | | | | Store FlashHashes in the session as plain hashes
| * | Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-093-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_forCarlos Antonio da Silva2012-11-193-10/+16
| | | | | | | | | | | | Merge url for tests and add changelog entry for #8233.
* | | Fix issue with params in url_fortumayun2012-11-192-1/+9
| | | | | | | | | | | | | | | | | | With a "params" argument, the following error is raised: undefined method `reject!` for "":String
* | | Refactor request tests, remove #with_set methodCarlos Antonio da Silva2012-11-191-8/+3
| |/ |/|
* | render every partial with a new `PartialRenderer`.Yves Senn2012-11-193-2/+18
| | | | | | | | | | | | | | | | 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 docSantiago Pastorino2012-11-191-9/+4
| |
* | Removed extra call to #diff in #assert_recognizes. assert_equal calls it for ↵Ryan Davis2012-11-171-4/+7
| | | | | | | | you and shows the diff. Also delayed message calculation so the cost of the diff on success is now gone.
* | Improve UpgradeSignatureToEncryptionCookieStore docsSantiago Pastorino2012-11-161-1/+14
| | | | | | | | | | I suck at English, please help me reviewing this <3 <3 <3 [ci skip]
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-172-20/+25
|\ \ | | | | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * | update syntax and add note about prompt use of HttpHelpers [ci-skip]Cesar Carruitero2012-11-091-12/+17
| | |
| * | correct link syntax [ci-skip]Cesar Carruitero2012-11-091-5/+5
| | |
| * | change rdoc syntax for adecuate render [ci-skip]Cesar Carruitero2012-11-091-1/+1
| | |
| * | change match to get and add single quotes in routing/redirection [ci-skip]Cesar Carruitero2012-11-081-8/+8
| | |
| * | Hash Syntax to 1.9 converisonAvnerCohen2012-11-071-3/+3
| | |
* | | Add UpgradeSignatureToEncryptionCookieStoreSantiago Pastorino2012-11-163-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 subclassesSantiago Pastorino2012-11-161-1/+1
| | |
* | | Add missing env param to get_cookieSantiago Pastorino2012-11-161-1/+1
| | |
* | | Move changelog entry from #8235 to the top [ci skip]Carlos Antonio da Silva2012-11-161-7/+7
| | |
* | | Refactor url methods a bitCarlos Antonio da Silva2012-11-161-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 <<.
* | | Fix failing template testsCarlos Antonio da Silva2012-11-161-2/+2
| | | | | | | | | | | | Introduced in 4a4de567b45ff28035419bc2d92f9b206e3c0a66.
* | | Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`.Joost Baaij2012-11-163-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a list of mime types where template text is not html escaped by default. It prevents `Jack & Joe` from rendering as `Jack &amp; 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.
* | | Remove extra whitespaceSantiago Pastorino2012-11-151-1/+1
| | |
* | | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-1510-56/+149
|\ \ \ | | | | | | | | Encrypted cookies
| * | | Disallow ability to use EncryptedCookieJar with DummyKeyGeneratorSantiago Pastorino2012-11-031-0/+5
| | | | | | | | | | | | | | | | | | | | Developers must set config.secret_key_base in config/initializers/secret_token.rb
| * | | Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-031-3/+3
| | | |
| * | | Move ensure_secret_secure to DummyKeyGeneratorSantiago Pastorino2012-11-032-25/+1
| | | |
| * | | Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-034-14/+33
| | | |
| * | | Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-032-4/+5
| | | |
| * | | Add encrypted cookie storeSantiago Pastorino2012-11-032-7/+25
| | | |
| * | | Add cookie.encrypted which returns an EncryptedCookieJarSantiago Pastorino2012-11-032-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | How to use it? cookies.encrypted[:discount] = 45 => Set-Cookie: discount=ZS9ZZ1R4cG1pcUJ1bm80anhQang3dz09LS1mbDZDSU5scGdOT3ltQ2dTdlhSdWpRPT0%3D--ab54663c9f4e3bc340c790d6d2b71e92f5b60315; path=/ cookies.encrypted[:discount] => 45
| * | | Sign cookies using key deriverSantiago Pastorino2012-11-035-28/+39
| | |/ | |/|
* | | Merge pull request #8222 from marcandre/avoid_slashRafael Mendonça França2012-11-142-1/+6
|\ \ \ | | | | | | | | Avoid using Integer#/, as it is redefined by the 'mathn' stdlib
| * | | Avoid using Integer#/, as it is redefined by the 'mathn' stdlibMarc-Andre Lafortune2012-11-142-1/+6
| | | |
* | | | Merge pull request #8218 from DawidJanczak/form-tag-docCarlos Antonio da Silva2012-11-141-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 objectAaron Patterson2012-11-131-14/+18
| | | |