X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8ba74c581dff4c66cbe07f94f4283298bb46f22c..62569a7b1b378d99ad7db46aab5f342302c91e40:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 3343161f9..241e79e92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,7 +49,7 @@ GEM faraday (0.7.5) addressable (~> 2.2.6) multipart-post (~> 1.1.3) - rack (< 2, >= 1.1.0) + rack (>= 1.1.0, < 2) hike (1.2.1) httpclient (2.2.3) i18n (0.6.0) @@ -120,7 +120,7 @@ GEM rmagick (2.13.1) ruby-openid (2.1.8) sanitize (2.0.3) - nokogiri (< 1.6, >= 1.4.4) + nokogiri (>= 1.4.4, < 1.6) sass (3.1.10) sass-rails (3.1.5) actionpack (~> 3.1.0) @@ -130,7 +130,7 @@ GEM sprockets (2.0.3) hike (~> 1.2) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) + tilt (~> 1.1, != 1.3.0) therubyracer (0.9.9) libv8 (~> 3.3.10) thor (0.14.6)