From 8feb7de8bfcd7d805b4ad193ee1b59bdc16694a8 Mon Sep 17 00:00:00 2001
From: Chrisbr <DWzJ-P42>
Date: Sun, 27 Apr 2014 14:40:04 +0200
Subject: [PATCH] Install formtastic from git master to fix issues with rails 4
 see: https://github.com/mjbellantoni/formtastic-bootstrap/issues/62 and
 https://github.com/justinfrench/formtastic/issues/999

---
 Gemfile      |  1 +
 Gemfile.lock | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 557a3d5f..da349852 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ gem 'uglifier', '>= 1.3.0'
 # Use bootstrap as the front-end framework
 gem 'bootstrap-sass'
 gem 'formtastic-bootstrap'
+gem 'formtastic', :git => 'https://github.com/justinfrench/formtastic.git'
 
 
 # Use jquery as the JavaScript library
diff --git a/Gemfile.lock b/Gemfile.lock
index b8e2fae5..4dc95918 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/justinfrench/formtastic.git
+  revision: 16a528a37d84f6c51ddbf196597e9472abc4e255
+  specs:
+    formtastic (2.3.0.rc3)
+      actionpack (>= 3.2.13)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -90,8 +97,6 @@ GEM
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    formtastic (2.2.1)
-      actionpack (>= 3.0)
     formtastic-bootstrap (3.0.0)
       formtastic (>= 2.2)
     gravtastic (3.2.6)
@@ -183,7 +188,7 @@ GEM
       yajl-ruby (~> 1.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec-collection_matchers (0.0.3)
+    rspec-collection_matchers (0.0.4)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.0.0.beta2)
       rspec-support (= 3.0.0.beta2)
@@ -264,6 +269,7 @@ DEPENDENCIES
   d3_rails
   devise
   factory_girl_rails
+  formtastic!
   formtastic-bootstrap
   gravtastic
   haml-rails