diff --git a/Gemfile.lock b/Gemfile.lock index ed357a6..5ef8ed2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,7 @@ GEM multi_json (~> 1.0) arel (3.0.2) bcrypt-ruby (3.0.1) - builder (3.0.0) + builder (3.0.4) capistrano (2.12.0) highline net-scp (>= 1.0.0) @@ -46,6 +46,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) devise (2.1.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -55,13 +56,14 @@ GEM execjs (1.4.0) multi_json (~> 1.0) highline (1.6.13) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.7.4) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.6) kgio (2.7.4) libv8 (3.3.10.4) mail (2.4.4) @@ -69,7 +71,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) - multi_json (1.3.6) + multi_json (1.14.0) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -79,12 +81,12 @@ GEM net-ssh (>= 1.99.1) orm_adapter (0.4.0) polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.5) actionmailer (= 3.2.5) @@ -102,8 +104,8 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.10.0) - rake (0.9.2.2) - rdoc (3.12) + rake (13.0.0) + rdoc (3.12.2) json (~> 1.4) rvm-capistrano (1.2.5) capistrano (>= 2.0.0) @@ -112,15 +114,15 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) therubyracer (0.10.1) libv8 (~> 3.3.10) - thor (0.15.4) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)