X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d218d5bf7d5e980635f8d9a773ab675786f8cea4..e20bb507f122f73d18021bf93efe85fc2e189dfb:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 18015c244..83d9ae473 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,12 +39,12 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) + addressable (2.4.0) arel (6.0.3) ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (6.1.0.1) + autoprefixer-rails (6.1.2) execjs json bigdecimal (1.1.0) @@ -70,10 +70,11 @@ GEM colorize (0.7.7) composite_primary_keys (8.1.1) activerecord (~> 4.2.0) - coveralls (0.8.9) + concurrent-ruby (1.0.0) + coveralls (0.8.10) json (~> 1.8) rest-client (>= 1.6.8, < 2) - simplecov (~> 0.10.0) + simplecov (~> 0.11.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) tins (~> 1.6.0) @@ -146,14 +147,14 @@ GEM mime-types (>= 1.16, < 3) mime-types (2.99) mimemagic (0.3.0) - mini_portile (0.6.2) + mini_portile2 (2.0.0) minitest (5.8.3) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) netrc (0.11.0) - nokogiri (1.6.6.4) - mini_portile (~> 0.6.0) + nokogiri (1.6.7) + mini_portile2 (~> 2.0.0.rc2) nokogumbo (1.4.1) nokogiri oauth (0.4.7) @@ -197,7 +198,7 @@ GEM parser (2.2.3.0) ast (>= 1.1, < 3.0) pg (0.18.4) - poltergeist (1.8.0) + poltergeist (1.8.1) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -213,6 +214,7 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) + rack-uri_sanitizer (0.0.2) rails (4.2.5) actionmailer (= 4.2.5) actionpack (= 4.2.5) @@ -270,13 +272,14 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - simplecov (0.10.0) + simplecov (0.11.1) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) soap4r-ruby1.9 (2.0.5) - sprockets (3.4.0) + sprockets (3.5.1) + concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) @@ -350,6 +353,7 @@ DEPENDENCIES psych r2 rack-cors + rack-uri_sanitizer rails (= 4.2.5) rails-i18n (~> 4.0.0) redcarpet