diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-16 16:39:14 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-16 16:39:14 +0000 |
| commit | 2d9e59b2b6dec7d6e98bd594cbd5295a4b6689ed (patch) | |
| tree | 6442bb642b8c643c7e59e07bf43bcf7d999d57f9 | |
| parent | 07dcbd97b9110d25e9cde3c93976254e73d919dc (diff) | |
| download | rails-2d9e59b2b6dec7d6e98bd594cbd5295a4b6689ed.tar.gz rails-2d9e59b2b6dec7d6e98bd594cbd5295a4b6689ed.tar.bz2 rails-2d9e59b2b6dec7d6e98bd594cbd5295a4b6689ed.zip | |
Enable diagnostics screen again
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@638 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 771e99c1df..ae7abe5e04 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed https handling on other ports than 443 [Alan Gano] + * Added follow_redirect method for functional tests that'll get-request the redirect that was made. Example: def test_create_post diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 907cebc250..0fe96479f4 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -117,7 +117,7 @@ module ActionController #:nodoc: when RoutingError then "routing_error" when UnknownAction then "unknown_action" when ActionView::TemplateError then "template_error" - else raise ;"diagnostics" + else "diagnostics" end ) end |