Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove observers and sweepers | Rafael Mendonça França | 2012-11-28 | 2 | -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 Ozols | 2012-11-27 | 1 | -2/+1 |
| | | | | | It's only possible to inherit from ActiveRecord::Base and not include it. | ||||
* | Remove warning of circular require | Rafael Mendonça França | 2012-11-27 | 1 | -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 value | Elia Schito | 2012-11-27 | 1 | -0/+1 |
| | |||||
* | assert_template: validating option keys | Roberto Soares | 2012-11-25 | 1 | -0/+2 |
| | |||||
* | `assert_template` fails with empty string. | Roberto Soares | 2012-11-23 | 1 | -8/+4 |
| | |||||
* | `assert_template` fails with empty string when a template has been rendered | Roberto Soares | 2012-11-23 | 1 | -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_sessions | Jon Leighton | 2012-11-21 | 1 | -1/+2 |
|\ | | | | | 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 | 1 | -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_cookies | Santiago Pastorino | 2012-11-15 | 2 | -7/+7 |
|\ \ | | | | | | | Encrypted cookies | ||||
| * | | Allow users to change the default salt if they want, shouldn't be necessary | Santiago Pastorino | 2012-11-03 | 1 | -2/+3 |
| | | | |||||
| * | | Use derived keys everywhere, http_authentication was missing it | Santiago Pastorino | 2012-11-03 | 1 | -3/+2 |
| | | | |||||
| * | | Sign cookies using key deriver | Santiago Pastorino | 2012-11-03 | 1 | -4/+4 |
| |/ | |||||
* | | 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 |
| | | |||||
* | | Revert "Merge pull request #8017 from jcoglan/objectless_sessions" | Jon Leighton | 2012-11-09 | 1 | -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_sessions | Jon Leighton | 2012-11-08 | 1 | -1/+2 |
|\ \ | | | | | | | 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 | -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 hash | Benjamin Quorning | 2012-11-06 | 1 | -1/+3 |
| | | |||||
* | | 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. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-03 | 16 | -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 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] | ||||
| * | 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 StrongParameters example [ci skip] | Francesco Rodriguez | 2012-10-21 | 1 | -1/+1 |
| | | |||||
* | | Allow #permit to take its list of permitted parameters as an array | David Heinemeier Hansson | 2012-10-31 | 1 | -1/+1 |
| | | |||||
* | | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 1 | -2/+2 |
| | | |||||
* | | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 2 | -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 actionpack | Yves Senn | 2012-10-27 | 1 | -1/+1 |
| | | |||||
* | | remain backwards compatible, exception can be constructed with no arguments | Aaron Patterson | 2012-10-25 | 1 | -1/+3 |
| | | |||||
* | | give access to the original exception raised in case of a parse error | Aaron Patterson | 2012-10-25 | 1 | -0/+7 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-21 | 1 | -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 Rodriguez | 2012-10-18 | 1 | -6/+31 |
| | | |||||
| * | remove some non-breaking spaces [ci skip] | Francesco Rodriguez | 2012-10-18 | 1 | -13/+13 |
| | | |||||
* | | There is already a Set of non-hidden action_names lying around. | thedarkone | 2012-10-18 | 1 | -8/+2 |
| | | |||||
* | | Permit string and float values in the multiparameter attributes | Rafael Mendonça França | 2012-10-18 | 1 | -1/+1 |
| | | |||||
* | | :fire: Rails asset id support | Joshua Peek | 2012-10-15 | 1 | -1/+0 |
| | | |||||
* | | warning removed: shadowing outer local variable - value | Arun Agrawal | 2012-10-12 | 1 | -2/+2 |
| | | |||||
* | | update AC::Parameters#permit documentation [ci skip] | Francesco Rodriguez | 2012-10-11 | 1 | -0/+22 |
| | | | | | | | | bdd105d changes the behaviour of AC::Parameters#permit. | ||||
* | | When executing permit with just a key that points to a hash, DO NOT allow ↵ | Santiago Pastorino | 2012-10-12 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | all the hash params.require(:person).permit(:projects_attributes) was returning => {"projects_attributes"=>{"0"=>{"name"=>"Project 1"}}} When should return => {} You should be doing ... params.require(:person).permit(projects_attributes: :name) to get just the projects attributes you want to allow | ||||
* | | refactor `ActionView::TestCase` internals to track rendered locals | Yves Senn | 2012-10-11 | 1 | -9/+4 |
| | | | | | | | | | | this refactoring extracts the semi complex data structure of rendered locals per view into into a separate class | ||||
* | | recognizes when a partial was rendered twice. Closes #3675 | Yves Senn | 2012-10-11 | 1 | -4/+10 |
| | |