From a9bf3a7e1fd802025824668e477a5ec14ce81d5a Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 13 Feb 2013 18:09:15 +0100
Subject: Encoding.default_external = Encoding::UTF_8

---
 Gemfile      |  9 +++++++--
 Gemfile.lock | 14 ++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index aa66bda..e4e839f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,8 @@
+if RUBY_VERSION =~ /1.9/
+  Encoding.default_external = Encoding::UTF_8
+  Encoding.default_internal = Encoding::UTF_8
+end
+
 source 'http://rubygems.org'
 
 gem 'rails', '3.2.12'
@@ -49,8 +54,8 @@ group :test do
 end
 
 gem 'haml'
-gem 'simple_form', '~> 2.0.1'
-# gem 'simple_form', github: 'plataformatec/simple_form', branch: 'v2.1'
+# gem 'simple_form', '~> 2.0.1'
+gem 'simple_form', github: 'plataformatec/simple_form', branch: 'v2.1'
 
 # Image Upload
 gem 'carrierwave'
diff --git a/Gemfile.lock b/Gemfile.lock
index 769b1bf..d8531cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+  remote: git://github.com/plataformatec/simple_form.git
+  revision: e3da7301dcf6feb9a1db275ff5cb3f85afce0e80
+  branch: v2.1
+  specs:
+    simple_form (2.1.0.dev)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -142,9 +151,6 @@ GEM
     sextant (0.2.3)
       activesupport (>= 3.2)
       rails (>= 3.2)
-    simple_form (2.0.4)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -215,7 +221,7 @@ DEPENDENCIES
   rails (= 3.2.12)
   sass-rails
   sextant
-  simple_form (~> 2.0.1)
+  simple_form!
   sqlite3
   state_machine
   strong_parameters
-- 
cgit v1.2.3