diff --git a/Gemfile.lock b/Gemfile.lock index 2e63802..c6e37ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,7 @@ GEM execjs coffee-script-source (1.6.2) columnize (0.3.6) + concurrent-ruby (1.1.6) daemons (1.1.9) debugger (1.6.0) columnize (>= 0.3.1) @@ -60,7 +61,8 @@ GEM haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) hike (1.2.3) - i18n (0.6.4) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.4.2) activesupport (>= 3.0.0) multi_json (>= 1.2.0) @@ -75,22 +77,22 @@ GEM jquery-ui-rails (4.0.3) jquery-rails railties (>= 3.1.0) - json (1.8.0) + json (2.3.0) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.23) - multi_json (1.7.6) + multi_json (1.15.0) pg (0.15.1) polyglot (0.3.3) populator (1.0.0) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.7.1) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.11) actionmailer (= 3.2.11) @@ -112,9 +114,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.4) - rdoc (3.12.2) - json (~> 1.4) + rake (12.2.1) + rdoc (3.9.5) sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) @@ -123,7 +124,7 @@ GEM simple_form (2.1.0) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -132,7 +133,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.18.1) + thor (0.20.3) tilt (1.4.1) treetop (1.4.14) polyglot