From 1f906cfbfc750b39c22e54176e6d09820e0be6b5 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fetsitetest.fet.htu.tuwien.ac.at>
Date: Sun, 1 Sep 2013 15:13:09 +0200
Subject: [PATCH] formtastic gem

---
 Gemfile      |  2 +-
 Gemfile.lock | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2ae738c..ae0f674 100755
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem 'jquery-rails'
 
 # Formbuilder for easier form generation
 gem 'formtastic', '~>2.2.1'
-gem 'formtastic-bootstrap' , :git => "git://github.com/mjbellantoni/formtastic-bootstrap.git"
+gem 'formtastic-bootstrap', '~>2.1.3' #, :git => "git://github.com/mjbellantoni/formtastic-bootstrap.git"
 # TinyMCE
 gem "tinymce-rails" , '>=3.5.8'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d4c61fb..c375160 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: git://github.com/mjbellantoni/formtastic-bootstrap.git
-  revision: 23c3dcdbd9cd583d95b9c2019dd66302a9206c87
-  specs:
-    formtastic-bootstrap (2.1.3)
-      formtastic (~> 2.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -78,6 +71,8 @@ GEM
       multipart-post (~> 1.2.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
+    formtastic-bootstrap (2.1.3)
+      formtastic (~> 2.2)
     git (1.2.5)
     globalize3 (0.3.0)
       activemodel (>= 3.0.0)
@@ -218,7 +213,7 @@ DEPENDENCIES
   execjs (~> 1.4.0)
   factory_girl_rails
   formtastic (~> 2.2.1)
-  formtastic-bootstrap!
+  formtastic-bootstrap (~> 2.1.3)
   git
   globalize3 (~> 0.3.0)
   haml