aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Changed a few instances of of words in the API docs written in British ↵Oemuer Oezkir2011-07-241-1/+1
| | | | | | English to American English(according to Weber)
* Ensure that status codes are logged properlyJesse Storimer2011-07-181-4/+4
| | | | | | Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue so that status codes rendered from rescue_from blocks are logged properly.
* Merge pull request #2009 from vatrai/autoload-todo-newJosé Valim2011-07-112-0/+2
|\ | | | | TODO fix explicitly loading exceptations, autoload removed
| * TODO fix explicitly loading exceptations, autoload removedVishnu Atrai2011-07-112-0/+2
| |
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-093-4/+4
|\ \ | |/ |/|
| * find(:all) => allAkira Matsuda2011-07-083-4/+4
| |
* | Remove stream at the class level.José Valim2011-07-061-38/+5
|/ | | | | | This is because only template rendering works with streaming. Setting it at the class level was also changing the behavior of JSON and XML responses, closes #1337.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-052-11/+13
|\
| * document handle_unverified_request methodVijay Dev2011-07-021-0/+2
| |
| * update doc about resetting the session in case of authenticity token mismatchVijay Dev2011-07-011-6/+5
| |
| * clarify which url would be used to cache a page when options are not ↵Matt Jankowski2011-06-261-2/+2
| | | | | | | | provided to #cache_page to determine that url
| * elaborate on how web server configuration to check for static files on disk ↵Matt Jankowski2011-06-261-3/+4
| | | | | | | | enables page caching to work without hitting the app server stack
* | Make sure respond_with with :js tries to render a template in all casesJosé Valim2011-06-301-0/+5
| |
* | [IMPORTANT] Make "sprockets/railtie" require explicit.José Valim2011-06-291-1/+0
| | | | | | | | | | | | | | | | | | | | This makes "sprockets/railtie" explicit. This means that sprockets will be loaded when you require "rails/all". If you are not using requiring "rails/all", you need to manually load it with all other framework railties. In order to be complete, this commit also adds --skip-sprockets to the rails generator.
* | Make send_file guess content-type from file extension, if type wasn't ↵Esad Hajdarevic2011-06-281-2/+13
| | | | | | | | supplied (Issue #1847). Update tests & documentation.
* | make the logs a little simpler to view, put the render message inline with ↵James Cox2011-06-241-4/+5
|/ | | | other events, pull processing to char[0] and add a new line to the completed. looks more like a block now, which is useful for serial actions like test/dev
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-231-7/+9
|\
| * more detail on how the flow between redirect and show works, and minor grammarMatt Jankowski2011-06-211-7/+9
| |
* | Fixes an issue where cache sweepers with only after filters would have no ↵Jeroen Jacobs2011-06-211-0/+1
| | | | | | | | | | | | controller object It would raise undefined method controller_name for nil
* | Call super here to allow SessionHash initialize new stuff for usSantiago Pastorino2011-06-191-1/+1
|/
* Tweak linebreak in ActionController::Redirecting docChristine Yen2011-06-151-2/+2
|
* Improve documentation around status code argument of redirect_toChristine Yen2011-06-151-1/+2
|
* remove warning: assigned but unused variableSantiago Pastorino2011-06-082-2/+1
|
* Added missing assert to test checking form with namespaced isolated model ↵Piotr Sarnacki2011-06-071-1/+1
| | | | and fixed helpers to work correctly in such case
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-063-6/+5
|\ | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS
| * Remove trailing white-spacesGuillermo Iguaran2011-06-051-1/+0
| |
| * some grammatical correctionsVijay Dev2011-06-041-3/+3
| |
| * Removing trailing white-spacesGuillermo Iguaran2011-05-311-2/+2
| |
* | Add backward compatibility for testing cookiesAndrew White2011-06-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit restores the ability to assign cookies for testing via @request.env['HTTP_COOKIE'] and @request.cookies, e.g: @request.env['HTTP_COOKIE'] = 'user_name=david' get :index assert_equal 'david', cookies[:user_name] and @request.cookies[:user_name] = 'david' get :index assert_equal 'david', cookies[:user_name] Assigning via cookies[] is the preferred method and will take precedence over the other two methods. This is so that cookies set in controller actions have precedence and are carried over between calls to get, post, etc.
* | Refactor ActionController::TestCase cookiesAndrew White2011-06-041-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning cookies for test cases should now use cookies[], e.g: cookies[:email] = 'user@example.com' get :index assert_equal 'user@example.com', cookies[:email] To clear the cookies, use clear, e.g: cookies.clear get :index assert_nil cookies[:email] We now no longer write out HTTP_COOKIE and the cookie jar is persistent between requests so if you need to manipulate the environment for your test you need to do it before the cookie jar is created.
* | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-testsJosé Valim2011-05-281-0/+19
|\ \ | | | | | | Stringify param values in controller tests.
| * | use to_param (and change method to name accordingly)David Chelimsky2011-05-221-8/+8
| | | | | | | | | | | | | | | - exclude Rack::Test::UploadedFile to pass existing tests. Are there any other types we're missing?
| * | Stringify param values in controller tests.David Chelimsky2011-05-221-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | This reduces false positives that come from using ints in params in tests, which do not get converted to strings in the tests. In implementations going through rack, they do get converted to strings. - David Chelimsky and Sam Umbach
* | | Merge pull request #1324 from dmathieu/no_error_on_invalid_formatJosé Valim2011-05-261-1/+1
|\ \ \ | |_|/ |/| | Don't raise an exception if the format isn't recognized
| * | don't raise an exception if the format isn't recognizeddmathieu2011-05-261-1/+1
| | | | | | | | | | | | Fixed while traveling to heuruko
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-256-14/+14
|\ \ \ | |/ / |/| | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * | fix minor spelling mistakes in commentsDmytrii Nagirniak2011-05-231-3/+3
| | |
| * | Remove extra white spaces on ActionPack docs.Sebastian Martinez2011-05-235-11/+11
| | |
* | | Replace references to ActiveSupport::SecureRandom with just SecureRandom, ↵Jon Leighton2011-05-232-2/+2
| |/ |/| | | | | and require 'securerandom' from the stdlib when active support is required.
* | renamed the wrap_parameters :only and :except options to :include and ↵Josh Kalderimis2011-05-191-17/+17
|/ | | | :exclude to make it consistent with controller filters
* Use anonymous? that works on both Ruby 1.8 and 1.9.José Valim2011-05-172-5/+7
|
* add more robust test for wrapping params with anonymous classDavid Chelimsky2011-05-172-3/+6
|
* Add fix for error when an anonymous controller subclasses ApplicationControllerAndy Lindeman2011-05-171-1/+4
|
* Make ParamsWrapper calling newly introduced `Model.attribute_names` instead ↵Prem Sichanugrist2011-05-151-3/+3
| | | | of `.column_names`
* Do not try to call `column_names` on the abstract class.Prem Sichanugrist2011-05-151-1/+1
| | | Normally the table for abstract class won't be existed, so we should not trying to call `#column_names` on it.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-141-0/+21
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
| * minor edits after going through what's new in docrailsXavier Noria2011-05-141-4/+7
| |
| * added an example for AC::UrlFor usage to make usage simpler.Nick Sutterer2011-05-121-1/+13
| |
| * added docs for AbC::UrlFor and AC::UrlFor.Nick Sutterer2011-05-121-0/+6
| |
* | Get around weird missing constant error caused by AS instead of simply ↵José Valim2011-05-111-5/+13
| | | | | | | | raising NameError, closes #477.