Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not mark the session as loaded if an error happened while doing it. | José Valim | 2010-06-25 | 1 | -2/+1 |
| | |||||
* | Calling exists? in the session store, without checking for stale sessions, ↵ | José Valim | 2010-06-25 | 2 | -10/+10 |
| | | | | was causing the cookie store to panic because we need to unpack the whole session to get its key. This commit fixes this issue and also caches exists calls for performance improvements. | ||||
* | Do not wrap hidden fields with error proc [#4962 state:resolved] | Carlos Antonio da Silva | 2010-06-25 | 2 | -3/+16 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Make sure that Rails doesn't resent session_id cookie over and over again if ↵ | Prem Sichanugrist | 2010-06-25 | 1 | -1/+3 |
| | | | | | | | | it's already there [#2485 state:resolved] This apply to only Active Record store and Memcached store, as they both store only the session_id, which will be unchanged, in the cookie. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Just reading flash messages should not create a session if one does not ↵ | José Valim | 2010-06-25 | 2 | -2/+12 |
| | | | | exist yet. | ||||
* | Avoid deserializing cookies too early, which causes session objects to not ↵ | José Valim | 2010-06-24 | 2 | -18/+22 |
| | | | | be available yet. Unfortunately, could not reproduce this in a test case. | ||||
* | Fix namespaced redirects [#4389 state:resolved] | Andrew White | 2010-06-24 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing ↵ | José Valim | 2010-06-24 | 8 | -89/+86 |
| | | | | frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved] | ||||
* | Avoid using Pathname on Resolver and AS::Dependencies. | José Valim | 2010-06-24 | 1 | -1/+1 |
| | |||||
* | Sessions should not be created until written to and session data should be ↵ | Michael Lovitt | 2010-06-23 | 5 | -30/+118 |
| | | | | | | | | destroyed on reset. [#4938] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Expose view via the view() method in AV::TestCase::Behavior | David Chelimsky | 2010-06-23 | 1 | -5/+8 |
| | | | | | | | | | | - was exposed as _view, which suggested it was private - left _view as an alias of view as not to break any extensions that are relying on _view [#4932 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | In ActionView::TestCase::Behavior, assign variables right before | David Chelimsky | 2010-06-23 | 2 | -2/+7 |
| | | | | | | | | | | | rendering the view. - Previously, _assigns were locked down the first time _view was referenced. [#4931 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | make text_field and hidden_field omit the value attribute if the developer ↵ | Jeff Dean | 2010-06-23 | 1 | -4/+4 |
| | | | | | | explicitly passes in :value => nil [#4839 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Fix controller_name for non default controller paths [#4901 state:resolved] | knapo | 2010-06-23 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Tidy up asset tag a bit and make railties tests green again. | José Valim | 2010-06-23 | 2 | -27/+22 |
| | |||||
* | refactored the javascript asset tag helpers and moved the default scripts ↵ | Josh Kalderimis | 2010-06-23 | 2 | -14/+14 |
| | | | | | | setup within the railtie Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Add the :path option to match routes when given as symbols. This is ↵ | Carlos Antonio da Silva | 2010-06-23 | 1 | -9/+8 |
| | | | | | | | | | | specially useful in http helpers for generating routes in scenarios like: resources :users, :path => 'usuarios' do get :search, :on => :collection, :path => 'pesquisar' end Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Provive resources_path_names helpers in the router. | José Valim | 2010-06-23 | 1 | -0/+4 |
| | |||||
* | Stop filling the blocks scope array with nil. | José Valim | 2010-06-22 | 1 | -1/+3 |
| | |||||
* | Allow namespace accept options in routes [#4936 state:resolved] | Carlos Antonio da Silva | 2010-06-22 | 1 | -3/+5 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Deprecate :name_prefix in the new router DSL. | José Valim | 2010-06-22 | 1 | -20/+22 |
| | |||||
* | Remove unused variable on assert_recognizes [#4912 state:resolved] | Paco Guzman | 2010-06-22 | 1 | -1/+0 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | update the list of instance variables that are excluded from assigns in view ↵ | David Chelimsky | 2010-06-22 | 1 | -9/+10 |
| | | | | | | | | tests [#4930 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | adds minus to value part of id [#4862 state:resolved] | RainerBlessing | 2010-06-22 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Add support for specifying locals in view tests with assert template [#4927 ↵ | David Chelimsky | 2010-06-22 | 2 | -3/+28 |
| | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | removed 'unless const_defined?' code smell | Josh Kalderimis | 2010-06-21 | 6 | -47/+39 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 16 | -205/+343 |
|\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| * | Use the new ActiveSupport::FileUpdateChecker instead of RoutesReloader. | José Valim | 2010-06-20 | 1 | -1/+1 |
| | | |||||
| * | Fixed date_select date_separator when discard_month and/or discard_day are ↵ | Thibaud Guillaume-Gentil | 2010-06-20 | 1 | -2/+4 |
| | | | | | | | | | | | | true [#4856 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Make sure a namespaced <%= render form %> still renders the _form partial ↵ | Jan De Poorter | 2010-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | [#4784 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Use Rack::Utils.bytesize when calculating content-length of exception pages. ↵ | Tarsoly András | 2010-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | [#4727 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | remove executable permission from files that don't need it. [#4802 ↵ | rohit | 2010-06-20 | 1 | -0/+0 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Support render_template in view tests. Useful for specifying which | David Chelimsky | 2010-06-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | partials are rendered under different conditions. [#4903 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Don't use module to work out shallow name prefix and path as it may not ↵ | Andrew White | 2010-06-20 | 1 | -9/+17 |
| | | | | | | | | | | | | accurately reflect the actual namespace [#4899 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Make polymorphic_url and scaffolding work with uncountable resources [#3930 ↵ | Andrew White | 2010-06-20 | 2 | -4/+13 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Accept an object for :constraints option [#4904 state:resolved] | Andrew White | 2010-06-20 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-20 | 4 | -14/+46 |
| |\ | |||||
| | * | option_groups_from_collection_for_select should return HTML-safe string ↵ | Wincent Colaiuta | 2010-06-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | [#4879 state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
| | * | Remove a relic of #request being in RackDelegation | wycats | 2010-06-19 | 2 | -6/+9 |
| | | | |||||
| | * | Custom resource routes should be scoped | Andrew White | 2010-06-19 | 1 | -7/+36 |
| | | | | | | | | | | | | | | | | | | [#3765] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Clear DescendantsTracker on each request. | José Valim | 2010-06-19 | 1 | -4/+4 |
| | | | |||||
| * | | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 1 | -11/+2 |
| |/ | |||||
| * | form_for without :html and with :remote should not error | David Genord II | 2010-06-18 | 1 | -1/+1 |
| | | | | | | | | | | | | [#4902 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | fix for :shallow in router not generating helpers for create, update, and ↵ | Josh Kalderimis | 2010-06-18 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | destroy actions when :only or :except are used [#4900 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Make text_helpers methods which return valid html to return it as safe and ↵ | Santiago Pastorino | 2010-06-17 | 1 | -6/+14 |
| | | | | | | | | | | | | | | | | sanitize the input always unless :sanitize => false is set [#4825 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Add shallow routing option to new router [#3765 status:committed] | Andrew White | 2010-06-17 | 1 | -156/+248 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | truncate() should not try to produce HTML-safe output | Wincent Colaiuta | 2010-06-17 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | | | | | | As discussed in Lighthouse ticket #4825 and ticket #4878, the truncate() method cannot guarantee safe output for all possible inputs/offsets, so it is best to leave the output unsafe so that it gets escaped when used in a view. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | | Take out documentation from DeprecatedMapper to discourage its usage. | Rizwan Reza | 2010-06-21 | 1 | -384/+0 |
| | | |||||
* | | Use h1 for titles. | Rizwan Reza | 2010-06-21 | 1 | -1/+1 |
| | | |||||
* | | Final touches and fixes. | Rizwan Reza | 2010-06-21 | 7 | -1/+9 |
| | |