diff --git a/Gemfile.lock b/Gemfile.lock index e36614d..13be50b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,6 +65,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.1.6) daemons (1.1.9) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) @@ -104,13 +105,14 @@ GEM hashery (2.1.1) highline (1.6.19) hike (1.2.3) - i18n (0.6.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jombo (1.0.11) journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (2.3.1) launchy (2.3.0) addressable (~> 2.3) letter_opener (1.1.2) @@ -128,7 +130,7 @@ GEM mini_magick (3.6.0) subexec (~> 0.2.1) mini_portile (0.5.1) - multi_json (1.8.1) + multi_json (1.15.0) mysql2 (0.3.13) nested_form (0.3.2) net-scp (1.1.2) @@ -161,12 +163,12 @@ GEM coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.12.0) 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) rack_session_access (0.1.1) builder (>= 2.0.0) @@ -192,8 +194,7 @@ GEM ffi (>= 0.5.0) rb-kqueue (0.2.0) ffi (>= 0.5.0) - rdoc (3.12.2) - json (~> 1.4) + rdoc (3.9.5) rspec (2.14.1) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) @@ -224,7 +225,7 @@ GEM spork-rails (4.0.0) rails (>= 3.0.0, < 5) spork (>= 1.0rc0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -232,7 +233,7 @@ GEM sqlite3 (1.3.8) state_machine (1.2.0) subexec (0.2.3) - thor (0.18.1) + thor (1.0.1) tilt (1.4.1) treetop (1.4.15) polyglot