Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2011-04-07 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: Cache flash now Revert "Use freeze instead of close!" Revert "Eagerly load Signed and Permanent cookies" cookies here Eagerly load Signed and Permanent cookies Use freeze instead of close! | ||||
| * | Cache flash now | Santiago Pastorino | 2011-04-07 | 1 | -1/+1 |
| | | |||||
| * | Revert "Use freeze instead of close!" | Santiago Pastorino | 2011-04-07 | 2 | -5/+14 |
| | | | | | | | | This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af. | ||||
| * | Revert "Eagerly load Signed and Permanent cookies" | Santiago Pastorino | 2011-04-07 | 1 | -17/+10 |
| | | | | | | | | This reverts commit dffeda377021ba8691381195f5a2889f8e040b93. | ||||
| * | Eagerly load Signed and Permanent cookies | Santiago Pastorino | 2011-04-07 | 1 | -10/+17 |
| | | |||||
| * | Use freeze instead of close! | Santiago Pastorino | 2011-04-06 | 2 | -14/+5 |
| | | |||||
* | | getting the flash hash under test | Aaron Patterson | 2011-04-06 | 1 | -0/+4 |
| | | |||||
* | | favor composition over inheritance, have FlashHash delegate to a Hash | Aaron Patterson | 2011-04-06 | 1 | -7/+40 |
|/ | |||||
* | CookieJar should prefer composition over inheritance | Aaron Patterson | 2011-04-06 | 1 | -6/+10 |
| | |||||
* | raise if someone tries to modify the cookies when it was already streamed ↵ | Santiago Pastorino | 2011-04-06 | 1 | -0/+12 |
| | | | | back to the client or converted to HTTP headers | ||||
* | Add ClosedError message to the initializer | Santiago Pastorino | 2011-04-06 | 2 | -5/+9 |
| | |||||
* | raise if someone tries to modify the flash when it was already streamed back ↵ | Santiago Pastorino | 2011-04-05 | 1 | -1/+19 |
| | | | | to the client or converted to HTTP headers | ||||
* | correction to the outputted controller name in the diagnostics error ↵ | Josh Kalderimis | 2011-03-24 | 1 | -1/+1 |
| | | | | | | template, test included Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 8 | -72/+165 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb | ||||
| * | Use run_callbacks; the generated _run_<name>_callbacks method is not a ↵ | John Firebaugh | 2011-01-31 | 2 | -5/+5 |
| | | | | | | | | | | | | public interface. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Add tld_length option when using domain :all in cookies | brainopia | 2011-01-21 | 1 | -9/+9 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Support list of possible domains for cookies | brainopia | 2011-01-21 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | use raise to create exceptions and to set the backtrace | Aaron Patterson | 2011-01-12 | 1 | -1/+1 |
| | | |||||
| * | reraising should be in the rescue block | Aaron Patterson | 2011-01-12 | 1 | -1/+1 |
| | | |||||
| * | Refactor to handle the X-Cascade without having to raise an exception | Krekoten' Marjan | 2011-01-09 | 1 | -12/+12 |
| | | |||||
| * | render :template is faster than render :file | Santiago Pastorino | 2011-01-01 | 2 | -5/+4 |
| | | |||||
| * | This is not needed anymore | Santiago Pastorino | 2011-01-01 | 1 | -3/+0 |
| | | |||||
| * | Don't deprecate to_prepare. | José Valim | 2010-12-23 | 1 | -4/+4 |
| | | |||||
| * | Clean up callbacks should also be called on exceptions. | José Valim | 2010-12-23 | 1 | -0/+3 |
| | | |||||
| * | Typo (request -> response) | John Firebaugh | 2010-12-21 | 1 | -1/+1 |
| | | |||||
| * | Expand ActionDispatch::Reloader docs | John Firebaugh | 2010-12-21 | 1 | -6/+14 |
| | | |||||
| * | Small changes on AD::Reloader. | José Valim | 2010-12-20 | 1 | -20/+3 |
| | | |||||
| * | Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepare | John Firebaugh | 2010-12-20 | 1 | -25/+6 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Introduce ActionDispatch::Reloader | John Firebaugh | 2010-12-20 | 1 | -0/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | Based on the implementation on the 2-3-stable branch, patches by Hongli Lai <hongli@phusion.nl>, and helpful suggestions from José Valim. Hongli Lai's patches included locking around the request cycle; this is now handled by Rack::Lock (https://github.com/rack/rack/issues/issue/87/). [#2873] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Fix edge cases for domain :all option on cookie store | brainopia | 2010-12-16 | 1 | -2/+5 |
|/ | | | | | | | | Dont set explicit domain for cookies if host is not a domain name [#6002 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Resolving LH #5986, cookies doc updates | Aditya Sanghi | 2010-11-26 | 1 | -3/+10 |
| | |||||
* | Ensure that Rails.env is defined first | Andrew White | 2010-10-27 | 1 | -1/+1 |
| | |||||
* | Don't write out secure cookies unless the request is secure | Andrew White | 2010-10-25 | 1 | -3/+11 |
| | |||||
* | Show exceptions rescues the original exception | Les Hill and Sandro Turriate | 2010-10-12 | 1 | -0/+13 |
| | | | | | | [#5784 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Ensure the proper content type is returned for static files. | José Valim | 2010-10-04 | 1 | -3/+3 |
| | |||||
* | Initialize sid should just skip instance variables. | José Valim | 2010-10-04 | 1 | -0/+7 |
| | |||||
* | Rely on Rack::Session stores API for more compatibility across the Ruby world. | José Valim | 2010-10-03 | 3 | -321/+76 |
| | |||||
* | no need to check for nil? | Neeraj Singh | 2010-09-30 | 1 | -1/+1 |
| | |||||
* | Avoid (@_var ||= nil) pattern by using initialize methods and ensuring ↵ | José Valim | 2010-09-29 | 2 | -2/+5 |
| | | | | everyone calls super as expected. | ||||
* | Remove more warnings on AP. | Emilio Tagua | 2010-09-28 | 1 | -2/+2 |
| | |||||
* | Remove method if exists, avoid calling Array#first so many times. | Emilio Tagua | 2010-09-28 | 1 | -3/+5 |
| | |||||
* | Initialize @compiled_at if it is not. | Emilio Tagua | 2010-09-28 | 1 | -0/+1 |
| | |||||
* | Remove warings from rescues: don't define more than once debug_hash method ↵ | Emilio Tagua | 2010-09-28 | 1 | -2/+2 |
| | | | | and ask if @response if defined. | ||||
* | Remove remaining warnings on _trace by adding parenthesis to gsub arguments. | Emilio Tagua | 2010-09-28 | 1 | -3/+3 |
| | |||||
* | Use parenthesis to avoid ambiguous first argument warning. | Emilio Tagua | 2010-09-28 | 1 | -1/+1 |
| | |||||
* | No need to call super here. Use yield instead block.call | Emilio Tagua | 2010-09-28 | 1 | -3/+2 |
| | |||||
* | Only send secure cookies over SSL. | W. Andrew Loe III | 2010-09-13 | 1 | -1/+4 |
| | |||||
* | Cleanup deprecations in Action Dispatch | Carlos Antonio da Silva | 2010-09-06 | 1 | -5/+0 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Do not use ActionController::Base.page_cache_extension in initialize to not ↵ | Piotr Sarnacki | 2010-09-04 | 1 | -4/+8 |
| | | | | load more ActiveSupport than we need | ||||
* | Optimize ActionDispatch::Static | Piotr Sarnacki | 2010-09-04 | 1 | -51/+35 |
| |