diff --git a/Gemfile.lock b/Gemfile.lock index 60edd2a..cb4939d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,7 +54,7 @@ GEM i18n (0.6.0) journey (1.0.4) jquery-rails (2.0.2) - railties (< 5.0, >= 3.2.0) + railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.7.3) libv8 (3.3.10.2) @@ -63,9 +63,12 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.18) + mini_portile2 (2.8.0) multi_json (1.3.6) multi_xml (0.5.1) - nokogiri (1.4.4) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) paperclip (3.1.4) activemodel (>= 3.0.0) activerecord (>= 3.0.0) @@ -74,6 +77,7 @@ GEM mime-types pg (0.13.2) polyglot (0.3.3) + racc (1.6.0) rack (1.4.1) rack-cache (1.2) rack (>= 0.4) @@ -95,7 +99,7 @@ GEM rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (< 2.0, >= 0.14.6) + thor (>= 0.14.6, < 2.0) rake (0.9.2.2) rdoc (3.12) json (~> 1.4) @@ -107,7 +111,7 @@ GEM sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) + tilt (~> 1.1, != 1.3.0) therubyracer (0.10.1) libv8 (~> 3.3.10) thor (0.15.3)