aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--app/models/help_page.rb1
2 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 16470fe5c..2ef530d27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,6 @@ jdk:
matrix:
exclude:
- rvm: 1.8.7
- jdk: openjdk6
-- rvm: 1.8.7
jdk: openjdk7
- rvm: 1.8.7
jdk: oraclejdk7
diff --git a/app/models/help_page.rb b/app/models/help_page.rb
index aa0c9c2b6..ea9d34e44 100644
--- a/app/models/help_page.rb
+++ b/app/models/help_page.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
class HelpPage
attr_accessor :slug, :content, :data