From 3004074e2ea03f7f0ba07c87ebfe1a50043c8299 Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Thu, 12 Mar 2015 19:33:15 +0500 Subject: [PATCH] downgrade simple_form because bootstrap 3 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 4a1bc67d2..3748cbcf3 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,7 @@ gem 'jquery-rails' gem 'jquery-migrate-rails' gem 'ruby-haml-js' gem 'slim' -gem 'simple_form' +gem 'simple_form', '3.1.0.rc2' gem 'friendly_id' gem 'rack-throttle', '~> 0.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index f49e52c08..646254365 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -485,7 +485,7 @@ GEM shoulda-context (1.2.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - simple_form (3.1.0) + simple_form (3.1.0.rc2) actionpack (~> 4.0) activemodel (~> 4.0) sinatra (1.4.5) @@ -656,7 +656,7 @@ DEPENDENCIES shotgun shoulda shoulda-matchers - simple_form + simple_form (= 3.1.0.rc2) sitemap_generator skype slim