diff --git a/Gemfile.lock b/Gemfile.lock index f83f974..779c732 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) cancan (1.6.8) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -39,6 +39,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -58,14 +59,15 @@ GEM gherkin (2.11.1) json (>= 1.4.6) hashie (1.2.0) - hike (1.2.1) + hike (1.2.3) httpauth (0.1) - i18n (0.6.0) + 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.3) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (2.2.0) jwt (0.1.5) multi_json (>= 1.0) mail (2.4.4) @@ -73,7 +75,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) - multi_json (1.3.6) + multi_json (1.14.0) multipart-post (1.1.5) oauth (0.4.6) oauth2 (0.8.0) @@ -93,12 +95,12 @@ GEM orm_adapter (0.4.0) pg (0.14.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.6) actionmailer (= 3.2.6) @@ -115,9 +117,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) + rake (13.0.0) + rdoc (3.9.5) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -139,14 +140,14 @@ GEM slim (1.2.2) temple (~> 0.4.0) tilt (~> 1.3.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) temple (0.4.0) - thor (0.15.4) - tilt (1.3.3) + thor (0.20.3) + tilt (1.3.7) treetop (1.4.10) polyglot polyglot (>= 0.3.1)