diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 14 |
2 files changed, 6 insertions, 11 deletions
@@ -49,7 +49,8 @@ group :test do end gem 'haml' -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 d8531cd..769b1bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -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: @@ -151,6 +142,9 @@ 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) @@ -221,7 +215,7 @@ DEPENDENCIES rails (= 3.2.12) sass-rails sextant - simple_form! + simple_form (~> 2.0.1) sqlite3 state_machine strong_parameters |