aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-23 21:41:18 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-23 21:41:18 -0700
commit53e2e8ef2bebb7fb444fe472c657ddb11fae1c89 (patch)
tree7b90f6e92d318a2112091a2448e2c1d5507a4149 /actionpack
parent23fb26a0dcbd46d36bdbc2caa267aa3192f77a24 (diff)
parentc471f13db63844fe290615ed6e1ddca32b26570d (diff)
downloadrails-53e2e8ef2bebb7fb444fe472c657ddb11fae1c89.tar.gz
rails-53e2e8ef2bebb7fb444fe472c657ddb11fae1c89.tar.bz2
rails-53e2e8ef2bebb7fb444fe472c657ddb11fae1c89.zip
Merge branch 'master' into i18n
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/template/url_helper_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 3065d33c1b..85e967ac1c 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
require 'abstract_unit'
RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port, :env)