X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/96b1bff9fb7012868edc90d44ac06c91f39f3e2c..2a2a204125383729223083f203a04e9e6eff873d:/Gemfile.lock?ds=sidebyside diff --git a/Gemfile.lock b/Gemfile.lock index a693e857c..ccf1438ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,10 +39,11 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) arel (6.0.3) ast (2.3.0) - autoprefixer-rails (6.5.1.1) + autoprefixer-rails (6.5.2) execjs bigdecimal (1.1.0) builder (3.2.2) @@ -75,6 +76,8 @@ GEM term-ansicolor (~> 1.3) thor (~> 0.19.1) tins (>= 1.6.0, < 2) + crack (0.4.3) + safe_yaml (~> 1.0.0) crass (1.0.2) dalli (2.7.6) deadlock_retry (1.2.0) @@ -94,6 +97,7 @@ GEM geoip (1.6.2) globalid (0.3.7) activesupport (>= 4.1.0) + hashdiff (0.3.0) hashie (3.4.6) htmlentities (4.3.4) http_accept_language (2.0.5) @@ -106,13 +110,17 @@ GEM image_size (~> 1.3) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) + image_optim_rails (0.2.0) + image_optim (~> 0.24.0) + rails + sprockets image_size (1.4.2) in_threads (1.3.1) jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jshint (1.4.0) + jshint (1.5.0) execjs (>= 1.4.0) multi_json (~> 1.0) therubyracer (~> 0.12.1) @@ -155,7 +163,7 @@ GEM multipart-post (2.0.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - nokogumbo (1.4.9) + nokogumbo (1.4.10) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -207,6 +215,7 @@ GEM powerpack (0.1.1) progress (3.2.2) psych (2.1.1) + public_suffix (2.0.4) r2 (0.2.6) rack (1.6.4) rack-cors (0.4.0) @@ -257,6 +266,7 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) ruby-openid (2.7.0) ruby-progressbar (1.8.1) + safe_yaml (1.0.4) sanitize (4.4.0) crass (~> 1.0.2) nokogiri (>= 1.4.4) @@ -298,6 +308,10 @@ GEM validates_email_format_of (1.6.3) i18n vendorer (0.1.16) + webmock (2.1.0) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -324,7 +338,7 @@ DEPENDENCIES htmlentities http_accept_language (~> 2.0.0) i18n-js (>= 3.0.0.rc10) - image_optim (>= 0.22.0) + image_optim_rails jquery-rails jshint json @@ -359,6 +373,7 @@ DEPENDENCIES uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) vendorer + webmock BUNDLED WITH - 1.10.6 + 1.12.5