summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock14
2 files changed, 11 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index b390a28..c90adb5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,8 +49,7 @@ group :test do
end
gem "haml"
-gem "simple_form", '2.0.1'
-
+gem "simple_form", github: 'plataformatec/simple_form', branch: 'v2.1'
# Image Upload
gem 'carrierwave'
gem "mini_magick"
diff --git a/Gemfile.lock b/Gemfile.lock
index 8491109..6f4888b 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:
@@ -141,9 +150,6 @@ GEM
sextant (0.2.3)
activesupport (>= 3.2)
rails (>= 3.2)
- simple_form (2.0.1)
- actionpack (~> 3.0)
- activemodel (~> 3.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -214,7 +220,7 @@ DEPENDENCIES
rails (= 3.2.11)
sass-rails
sextant
- simple_form (= 2.0.1)
+ simple_form!
sqlite3
state_machine
strong_parameters