aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Fix a typo in ActionController::CachingJean Boussier2012-12-031-2/+1
|
* Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-011-2/+0
|
* Revert "Remove trailing whitespaces"Florent Guilleux2012-12-011-1/+1
| | | | This reverts commit 90c887fa7d0c454b7533e208daefc342dea4d5f3.
* Remove trailing whitespacesFlorent Guilleux2012-12-011-1/+1
|
* hash filters should be accessed with symbols or stringsFrancesco Rodriguez2012-11-301-3/+5
|
* Remove observers and sweepersRafael Mendonça França2012-11-282-121/+2
| | | | | | | | They was extracted from a plugin. See https://github.com/rails/rails-observers [Rafael Mendonça França + Steve Klabnik]
* Fix Strong Parameters docs.Uģis Ozols2012-11-271-2/+1
| | | | | It's only possible to inherit from ActiveRecord::Base and not include it.
* Remove warning of circular requireRafael Mendonça França2012-11-271-1/+1
| | | | | | | | | This file was using mime_types before load the Mime::Type class. When trying to register first Mime::Type it load mime_type that loads mime_types in the end. Requiring mime_type ensure that we have the class definition and the mime types
* Accept symbols as #send_data :disposition valueElia Schito2012-11-271-0/+1
|
* assert_template: validating option keysRoberto Soares2012-11-251-0/+2
|
* `assert_template` fails with empty string.Roberto Soares2012-11-231-8/+4
|
* `assert_template` fails with empty string when a template has been renderedRoberto Soares2012-11-231-4/+8
| | | | | | | | For instance, it prevents false positive in this case: file = nil get :index assert_template("#{file}")
* Merge pull request #8183 from jcoglan/objectless_sessionsJon Leighton2012-11-211-1/+2
|\ | | | | Store FlashHashes in the session as plain hashes
| * Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-152-7/+7
|\ \ | | | | | | Encrypted cookies
| * | Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-031-2/+3
| | |
| * | Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-031-3/+2
| | |
| * | Sign cookies using key deriverSantiago Pastorino2012-11-031-4/+4
| |/
* | lazily calculate name in the options objectAaron Patterson2012-11-131-14/+18
| |
* | move include calculation to include method on the options objectAaron Patterson2012-11-131-9/+24
| |
* | model name is lazily evaluated in the options objectAaron Patterson2012-11-131-27/+37
| |
* | move the controller class to the options objectAaron Patterson2012-11-131-9/+12
| |
* | attribute_names will always return a list, so just use any?Aaron Patterson2012-11-131-1/+1
| |
* | wrap up hash conversion in the constructorAaron Patterson2012-11-131-5/+5
| |
* | use the options object in the wrapper defaultsAaron Patterson2012-11-131-13/+12
| |
* | start using options objectAaron Patterson2012-11-131-9/+20
| |
* | only do hash lookups on options onceAaron Patterson2012-11-131-13/+15
| |
* | replace present? with any? to reduce dependency on ASAaron Patterson2012-11-132-1/+2
| |
* | Revert "Merge pull request #8017 from jcoglan/objectless_sessions"Jon Leighton2012-11-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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_sessionsJon Leighton2012-11-081-1/+2
|\ \ | | | | | | Store FlashHashes in the session as plain hashes
| * | Store FlashHashes in the session as plain hashes rather than custom objects ↵James Coglan2012-11-031-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Set @permitted on new instance when slicing parameters hashBenjamin Quorning2012-11-061-1/+3
| |
* | Remove #permitted attr accessor from ParametersCarlos Antonio da Silva2012-11-031-1/+0
|/ | | | | There is no need to expose this accessor since we already have the query method #permitted? that should handle this purpose.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-0316-79/+79
|\ | | | | | | | | | | | | 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 Dev2012-11-031-1/+21
| | | | | | | | | | | | | | | | This reverts commit cd17ee5598411728747011566abf6779166be9d3. Reason: Let's note that this is discouraged, not remove the docs [ci skip]
| * dont encourage AC::Parameters#permit_all_parameters usage [ci skip]Francesco Rodriguez2012-10-281-21/+1
| |
| * Multiple changes to 1,9 hash syntaxAvnerCohen2012-10-2715-77/+77
| |
| * fix StrongParameters example [ci skip]Francesco Rodriguez2012-10-211-1/+1
| |
* | Allow #permit to take its list of permitted parameters as an arrayDavid Heinemeier Hansson2012-10-311-1/+1
| |
* | Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-301-2/+2
| |
* | Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-292-5/+5
| | | | | | | | 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.
* | cleanup, remove trailing whitespace within actionpackYves Senn2012-10-271-1/+1
| |
* | remain backwards compatible, exception can be constructed with no argumentsAaron Patterson2012-10-251-1/+3
| |
* | give access to the original exception raised in case of a parse errorAaron Patterson2012-10-251-0/+7
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-211-17/+42
|\ | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md
| * add a nested attributes example into Strong Parameters documentation [ci skip]Francesco Rodriguez2012-10-181-6/+31
| |
| * remove some non-breaking spaces [ci skip]Francesco Rodriguez2012-10-181-13/+13
| |
* | There is already a Set of non-hidden action_names lying around.thedarkone2012-10-181-8/+2
| |
* | Permit string and float values in the multiparameter attributesRafael Mendonça França2012-10-181-1/+1
| |
* | :fire: Rails asset id supportJoshua Peek2012-10-151-1/+0
| |