From 868ae77692d2afc4495bf43fe105971e64c66314 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Wed, 27 Mar 2019 11:10:21 +0100 Subject: [PATCH] Upgrade gem rails and its dependecies --- Gemfile | 16 ++--- Gemfile.lock | 196 +++++++++++++++++++++++++++------------------------ 2 files changed, 113 insertions(+), 99 deletions(-) diff --git a/Gemfile b/Gemfile index c44b24cc9..95e998ae5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "4.2.11.1" +gem "rails", "5.0.7.2" gem "acts-as-taggable-on", "~> 5.0.0" gem "acts_as_votable", "~> 0.11.1" @@ -15,11 +15,13 @@ gem "coffee-rails", "~> 4.2.2" gem "daemons", "~> 1.2.4" gem "dalli", "~> 2.7.6" gem "delayed_job_active_record", "~> 4.1.3" -gem "devise", "~> 3.5.7" -gem "devise-async", "~> 0.10.2" -gem "devise_security_extension", "~> 0.10.0" +gem "devise", "~> 4.3.0" +gem "devise-async", "~> 1.0.0" +gem "devise_security_extension", git: "https://github.com/phatworx/devise_security_extension.git" #, "~> 0.10" gem "foundation-rails", "~> 6.4.3.0" gem "foundation_rails_helper", "~> 2.0.0" +gem "globalize", "~> 5.2.0" +gem "globalize-accessors", "~> 0.2.1" gem "graphiql-rails", "~> 1.4.1" gem "graphql", "~> 1.7.8" gem "groupdate", "~> 3.2.0" @@ -38,6 +40,7 @@ gem "paperclip", "~> 5.2.1" gem "paranoia", "~> 2.4.1" gem "pg", "~> 0.21.0" gem "pg_search", "~> 2.0.1" +gem 'record_tag_helper', '~> 1.0' gem "redcarpet", "~> 3.4.0" gem "responders", "~> 2.4.0" gem "rinku", "~> 2.0.2", require: "rails_rinku" @@ -52,8 +55,6 @@ gem "turnout", "~> 2.4.0" gem "uglifier", "~> 4.1.19" gem "unicorn", "~> 5.4.1" gem "whenever", "~> 0.10.0", require: false -gem "globalize", "~> 5.0.0" -gem "globalize-accessors", "~> 0.2.1" gem "recipient_interceptor", "~> 0.2.0" source "https://rails-assets.org" do @@ -70,7 +71,6 @@ group :development, :test do gem "knapsack_pro", "~> 1.1.0" gem "launchy", "~> 2.4.3" gem "letter_opener_web", "~> 1.3.4" - gem "quiet_assets", "~> 1.1.0" gem "spring", "~> 2.0.1" gem "spring-commands-rspec", "~> 1.0.4" end @@ -81,7 +81,7 @@ group :test do gem "database_cleaner", "~> 1.7.0" gem "email_spec", "~> 2.1.0" gem "rspec-rails", "~> 3.8" - gem "selenium-webdriver", "~> 3.10" + gem "selenium-webdriver", "~> 3.141" end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 07fdf7c89..6b5812709 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,51 @@ +GIT + remote: https://github.com/phatworx/devise_security_extension.git + revision: b2ee978af7d49f0fb0e7271c6ac074dfb4d39353 + specs: + devise_security_extension (0.10.0) + devise (>= 3.0.0, < 5.0) + railties (>= 3.2.6, < 6.0) + GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.2.11.1) - actionpack (= 4.2.11.1) - actionview (= 4.2.11.1) - activejob (= 4.2.11.1) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11.1) - actionview (= 4.2.11.1) - activesupport (= 4.2.11.1) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11.1) - activesupport (= 4.2.11.1) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11.1) - activesupport (= 4.2.11.1) - globalid (>= 0.3.0) - activemodel (4.2.11.1) - activesupport (= 4.2.11.1) - builder (~> 3.1) - activerecord (4.2.11.1) - activemodel (= 4.2.11.1) - activesupport (= 4.2.11.1) - arel (~> 6.0) - activesupport (4.2.11.1) - i18n (~> 0.7) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) + globalid (>= 0.3.6) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) + arel (~> 7.0) + activesupport (5.0.7.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) acts-as-taggable-on (5.0.0) activerecord (>= 4.2.8) @@ -59,7 +70,7 @@ GEM nokogiri ancestry (3.0.2) activerecord (>= 3.2.0) - arel (6.0.4) + arel (7.1.4) ast (2.4.0) autoprefixer-rails (8.2.0) execjs @@ -67,7 +78,7 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bcrypt (3.1.11) + bcrypt (3.1.12) better_html (1.0.13) actionview (>= 4.0) activesupport (>= 4.0) @@ -104,7 +115,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) - childprocess (0.8.0) + childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) ckeditor (4.2.4) @@ -138,18 +149,15 @@ GEM delayed_job_active_record (4.1.3) activerecord (>= 3.0, < 5.3) delayed_job (>= 3.0, < 5) - devise (3.5.10) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 5.2) responders - thread_safe (~> 0.1) warden (~> 1.2.3) - devise-async (0.10.2) - devise (>= 3.2, < 4.0) - devise_security_extension (0.10.0) - devise (>= 3.0.0, < 4.0) - railties (>= 3.2.6, < 5.0) + devise-async (1.0.0) + activejob (>= 5.0) + devise (>= 4.0) diff-lcs (1.3) docile (1.3.1) email_spec (2.1.1) @@ -174,9 +182,9 @@ GEM railties (>= 3.0.0) faker (1.8.7) i18n (>= 0.7) - faraday (0.12.1) + faraday (0.12.2) multipart-post (>= 1.2, < 3) - ffi (1.9.25) + ffi (1.10.0) foundation-rails (6.4.3.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) @@ -187,12 +195,13 @@ GEM activesupport (>= 4.1) railties (>= 4.1) tzinfo (~> 1.2, >= 1.2.2) - geocoder (1.4.4) + geocoder (1.4.5) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.0.1) - activemodel (>= 4.2.0, < 4.3) - activerecord (>= 4.2.0, < 4.3) + globalize (5.2.0) + activemodel (>= 4.2, < 5.3) + activerecord (>= 4.2, < 5.3) + request_store (~> 1.0) globalize-accessors (0.2.1) globalize (~> 5.0, >= 5.0.0) graphiql-rails (1.4.8) @@ -269,6 +278,7 @@ GEM kramdown (~> 1.12, >= 1.12.0) mixlib-cli (~> 1.7, >= 1.7.0) mixlib-config (~> 2.2, >= 2.2.1) + method_source (0.9.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) @@ -286,10 +296,11 @@ GEM net-ssh (>= 2.6.5) net-ssh (5.0.2) newrelic_rpm (4.1.0.333) - nokogiri (1.10.1) + nio4r (2.3.1) + nokogiri (1.10.2) mini_portile2 (~> 2.4.0) nori (2.6.0) - oauth (0.5.3) + oauth (0.5.4) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) @@ -309,8 +320,8 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) @@ -334,39 +345,36 @@ GEM arel (>= 6) powerpack (0.1.2) public_suffix (3.0.3) - quiet_assets (1.1.0) - railties (>= 3.1, < 5.0) - rack (1.6.11) + rack (2.0.6) rack-accept (0.4.5) rack (>= 0.4) rack-attack (5.0.1) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.11.1) - actionmailer (= 4.2.11.1) - actionpack (= 4.2.11.1) - actionview (= 4.2.11.1) - activejob (= 4.2.11.1) - activemodel (= 4.2.11.1) - activerecord (= 4.2.11.1) - activesupport (= 4.2.11.1) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11.1) - sprockets-rails - rails-assets-leaflet (1.1.0) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) + bundler (>= 1.3.0) + railties (= 5.0.7.2) + sprockets-rails (>= 2.0.0) + rails-assets-leaflet (1.2.0) rails-assets-markdown-it (8.2.2) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (4.2.11.1) - actionpack (= 4.2.11.1) - activesupport (= 4.2.11.1) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) @@ -374,12 +382,15 @@ GEM rake (12.3.2) recipient_interceptor (0.2.0) mail + record_tag_helper (1.0.0) + actionview (~> 5.x) redcarpet (3.4.0) referer-parser (0.3.0) - request_store (1.3.2) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + request_store (1.4.0) + rack (>= 1.4) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rinku (2.0.4) rollbar (2.18.0) multi_json @@ -391,7 +402,7 @@ GEM rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.1) + rspec-rails (3.8.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -434,9 +445,9 @@ GEM scss_lint (0.55.0) rake (>= 0.9, < 13) sass (~> 3.4.20) - selenium-webdriver (3.10.0) + selenium-webdriver (3.141.0) childprocess (~> 0.5) - rubyzip (~> 1.2) + rubyzip (~> 1.2, >= 1.2.2) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -475,9 +486,9 @@ GEM tilt (2.0.8) tins (1.16.3) tomlrb (1.2.7) - turbolinks (2.5.3) + turbolinks (2.5.4) coffee-rails - turnout (2.4.0) + turnout (2.4.1) i18n (~> 0.7) rack (>= 1.3, < 3) rack-accept (~> 0.4) @@ -491,10 +502,10 @@ GEM kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.11.0) - user_agent_parser (2.3.1) + user_agent_parser (2.4.1) uuidtools (2.1.5) - warden (1.2.7) - rack (>= 1.0) + warden (1.2.8) + rack (>= 2.0.6) wasabi (3.5.0) httpi (~> 2.0) nokogiri (>= 1.4.2) @@ -502,6 +513,9 @@ GEM activemodel (>= 4.2) debug_inspector railties (>= 4.2) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) whenever (0.10.0) chronic (>= 0.6.3) xpath (3.0.0) @@ -533,16 +547,16 @@ DEPENDENCIES dalli (~> 2.7.6) database_cleaner (~> 1.7.0) delayed_job_active_record (~> 4.1.3) - devise (~> 3.5.7) - devise-async (~> 0.10.2) - devise_security_extension (~> 0.10.0) + devise (~> 4.3.0) + devise-async (~> 1.0.0) + devise_security_extension! email_spec (~> 2.1.0) erb_lint factory_bot_rails (~> 4.8.2) faker (~> 1.8.7) foundation-rails (~> 6.4.3.0) foundation_rails_helper (~> 2.0.0) - globalize (~> 5.0.0) + globalize (~> 5.2.0) globalize-accessors (~> 0.2.1) graphiql-rails (~> 1.4.1) graphql (~> 1.7.8) @@ -567,11 +581,11 @@ DEPENDENCIES paranoia (~> 2.4.1) pg (~> 0.21.0) pg_search (~> 2.0.1) - quiet_assets (~> 1.1.0) - rails (= 4.2.11.1) + rails (= 5.0.7.2) rails-assets-leaflet! rails-assets-markdown-it (~> 8.2.1)! recipient_interceptor (~> 0.2.0) + record_tag_helper (~> 1.0) redcarpet (~> 3.4.0) responders (~> 2.4.0) rinku (~> 2.0.2) @@ -583,7 +597,7 @@ DEPENDENCIES sass-rails (~> 5.0, >= 5.0.4) savon (~> 2.12.0) scss_lint (~> 0.55.0) - selenium-webdriver (~> 3.10) + selenium-webdriver (~> 3.141) sitemap_generator (~> 6.0.1) social-share-button (~> 1.1) spring (~> 2.0.1)