summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock73
1 files changed, 40 insertions, 33 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 8491109..d8531cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,31 +1,40 @@
+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:
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_list (0.1.9)
@@ -66,7 +75,7 @@ GEM
dalli (2.6.2)
delayed_job (3.0.5)
activesupport (~> 3.0)
- delayed_job_active_record (0.4.0)
+ delayed_job_active_record (0.4.1)
activerecord (>= 2.1.0, < 4)
delayed_job (~> 3.0)
erubis (2.7.0)
@@ -79,7 +88,8 @@ GEM
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
fssm (0.2.10)
- haml (3.1.7)
+ haml (4.0.0)
+ tilt
hike (1.2.1)
hirb (0.7.1)
http_accept_language (1.0.2)
@@ -100,7 +110,7 @@ GEM
mime-types (1.21)
mini_magick (3.4)
subexec (~> 0.2.1)
- multi_json (1.5.1)
+ multi_json (1.6.0)
mysql2 (0.3.11)
nokogiri (1.5.6)
open4 (1.3.0)
@@ -114,17 +124,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rails (3.2.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (= 3.2.12)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -141,9 +151,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)
@@ -211,10 +218,10 @@ DEPENDENCIES
mysql2
nokogiri
quiet_assets
- rails (= 3.2.11)
+ rails (= 3.2.12)
sass-rails
sextant
- simple_form (= 2.0.1)
+ simple_form!
sqlite3
state_machine
strong_parameters