X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/970e1a99d7dce64f0631e88c5b9f060fb48d75fe..8bd98b5da866ef692a1cad493acbf6367fa4ca18:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 181da7f09..a8c91f460 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,8 +15,8 @@ GEM rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionpack-page_caching (1.0.2) - actionpack (>= 4.0.0, < 5) + actionpack-page_caching (1.1.0) + actionpack (>= 4.0.0, < 6) actionview (4.2.7.1) activesupport (= 4.2.7.1) builder (~> 3.1) @@ -41,21 +41,20 @@ GEM tzinfo (~> 1.1) addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) - arel (6.0.3) + arel (6.0.4) ast (2.3.0) - autoprefixer-rails (6.5.3) + autoprefixer-rails (6.7.2) execjs bigdecimal (1.1.0) - builder (3.2.2) - capybara (2.10.2) + builder (3.2.3) + capybara (2.12.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - climate_control (0.0.3) - activesupport (>= 3.0) + climate_control (0.1.0) cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) @@ -65,17 +64,17 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.11.1) + coffee-script-source (1.12.2) colorize (0.8.1) composite_primary_keys (8.1.4) activerecord (~> 4.2.0) - concurrent-ruby (1.0.2) - coveralls (0.8.16) + concurrent-ruby (1.0.4) + coveralls (0.8.19) json (>= 1.8, < 3) simplecov (~> 0.12.0) - term-ansicolor (~> 1.3.0) + term-ansicolor (~> 1.3) thor (~> 0.19.1) - tins (>= 1.6.0, < 2) + tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.2) @@ -86,23 +85,23 @@ GEM erubis (2.7.0) execjs (2.7.0) exifr (1.2.5) - factory_girl (4.7.0) + factory_girl (4.8.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.8.0) + factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.9.2) + faraday (0.10.1) multipart-post (>= 1.2, < 3) fspath (3.0.1) - geoip (1.6.2) + geoip (1.6.3) globalid (0.3.7) activesupport (>= 4.1.0) - hashdiff (0.3.1) + hashdiff (0.3.2) hashie (3.4.6) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.7.0) - i18n-js (3.0.0.rc14) + i18n (0.8.0) + i18n-js (3.0.0.rc15) i18n (~> 0.6, >= 0.6.6) image_optim (0.24.1) exifr (~> 1.2, >= 1.2.2) @@ -116,7 +115,7 @@ GEM sprockets image_size (1.5.0) in_threads (1.3.1) - jquery-rails (4.2.1) + jquery-rails (4.2.2) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -124,14 +123,14 @@ GEM execjs (>= 1.4.0) multi_json (~> 1.0) therubyracer (~> 0.12.1) - json (1.8.3) + json (1.8.6) jsonify (0.3.1) multi_json (~> 1.0) jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) jwt (1.5.6) - kgio (2.10.0) + kgio (2.11.0) konacha (4.0.0) actionpack (>= 4.1, < 5) capybara @@ -143,7 +142,7 @@ GEM libv8 (3.16.14.17) libxml-ruby (2.9.0) logstash-event (1.2.02) - logstasher (1.1.0) + logstasher (1.1.1) activerecord (>= 4.0) activesupport (>= 4.0) logstash-event (~> 1.2.0) @@ -159,9 +158,9 @@ GEM mini_portile2 (2.1.0) minitest (5.10.1) multi_json (1.12.1) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) - nokogiri (1.6.8.1) + nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) nokogumbo (1.4.10) nokogiri @@ -171,25 +170,31 @@ GEM oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) + oauth2 (1.3.0) + faraday (>= 0.8, < 0.11) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.3.1) + omniauth (1.3.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) + omniauth-github (1.2.0) + omniauth (~> 1.3.2) + omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-google-oauth2 (0.4.1) jwt (~> 1.5.2) multi_json (~> 1.3) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.3.1) + omniauth-mediawiki (0.0.3) + jwt (~> 1.0) + omniauth-oauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) @@ -208,17 +213,17 @@ GEM parser (2.3.3.1) ast (~> 2.2) pg (0.19.0) - poltergeist (1.11.0) + poltergeist (1.13.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) - progress (3.2.2) - psych (2.2.1) - public_suffix (2.0.4) + progress (3.3.0) + psych (2.2.2) + public_suffix (2.0.5) r2 (0.2.6) rack (1.6.5) - rack-cors (0.4.0) + rack-cors (0.4.1) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -238,9 +243,9 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) @@ -252,14 +257,15 @@ GEM activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - rake (11.3.0) - redcarpet (3.3.4) + rainbow (2.2.1) + rake (12.0.0) + redcarpet (3.4.0) ref (2.0.0) - request_store (1.3.1) + request_store (1.3.2) rinku (2.0.2) - rubocop (0.46.0) - parser (>= 2.3.1.1, < 3.0) + rotp (3.3.0) + rubocop (0.47.1) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) @@ -271,7 +277,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.4.22) + sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -283,36 +289,36 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sprockets (3.7.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - term-ansicolor (1.3.2) + term-ansicolor (1.4.0) tins (~> 1.0) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref thor (0.19.4) thread_safe (0.3.5) - tilt (2.0.5) + tilt (2.0.6) timecop (0.8.1) - tins (1.13.0) + tins (1.13.2) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (3.0.4) execjs (>= 0.3.0, < 3) - unicode-display_width (1.1.1) + unicode-display_width (1.1.3) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) - webmock (2.1.0) + webmock (2.3.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket-driver (0.6.4) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) xpath (2.0.0) @@ -353,6 +359,7 @@ DEPENDENCIES omniauth-facebook omniauth-github omniauth-google-oauth2 (>= 0.2.7) + omniauth-mediawiki (>= 0.0.3) omniauth-openid omniauth-windowslive paperclip (~> 4.0) @@ -366,6 +373,7 @@ DEPENDENCIES rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) + rotp rubocop sanitize sass-rails (~> 5.0)