diff --git a/Gemfile b/Gemfile index 2209f66d..6b58fa6d 100644 --- a/Gemfile +++ b/Gemfile @@ -7,9 +7,9 @@ gem 'rails', '~> 4.2.11' gem "elasticsearch", '~> 1.0.17' gem 'mysql2', '~> 0.3.17' gem 'puma', '~> 3.11.4' -gem 'redis', '~> 3.1' -gem "resque", '~> 1.25', :require => "resque/server" -gem 'resque-scheduler', '~> 3.0.0' +gem 'redis', '~> 5.0' +gem "resque", '~> 2.6', :require => "resque/server" +gem 'resque-scheduler', '~> 4.10.2' # exernal services gem 'google-api-client', '~> 0.10' @@ -20,8 +20,8 @@ gem "nuntium_api", "~> 0.13", :require => "nuntium" # authentication/authorization gem 'devise', '~> 3.3' gem 'cancancan', '~> 1.9' -gem "omniauth", '~> 1.2' -gem "omniauth-openid", '~> 1.0' +gem "omniauth", '~> 2.0' +gem "omniauth-openid", '~> 2.0' gem 'alto_guisso', :git => "https://github.com/instedd/alto_guisso", branch: 'master' gem 'alto_guisso_rails', :git => "https://github.com/instedd/alto_guisso_rails", branch: 'master' @@ -62,7 +62,7 @@ gem 'jquery-rails', "~> 2.0.2" gem 'lodash-rails' gem 'knockoutjs-rails', '~> 3.2.0' gem 'rails-assets-knockout-sortable', :source => 'https://rails-assets.org' -gem 'sass-rails', '~> 4.0.1' +gem 'sass-rails', '~> 6.0.0' gem 'uglifier', '>= 2.5.0' # dependency fixes (to be removed) @@ -75,7 +75,7 @@ group :development do end group :test do - gem 'capybara', '~> 2.18' # 3.x requires rack 1.6 but rails 4.1 requires 1.5 + gem 'capybara', '~> 3.39' # 3.x requires rack 1.6 but rails 4.1 requires 1.5 gem 'database_cleaner' gem 'faker' gem 'machinist', '1.0.6' @@ -90,7 +90,7 @@ end group :test, :development do # gem 'quiet_assets', '~> 1.1.0' # gem 'guard-jasmine', '~> 2.0.6' - gem 'jasmine', '~> 2.7.0' + gem 'jasmine', '~> 3.8.0' # gem 'memory_profiler' # gem 'pry-byebug' gem 'rspec-rails', '~> 3.4.0' diff --git a/Gemfile.lock b/Gemfile.lock index 88c8d9ed..909cca5d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,23 +89,25 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) arel (6.0.4) attr_required (1.0.1) bcrypt (3.1.19) - bindata (2.4.14) + bindata (2.4.15) breadcrumbs_on_rails (2.3.1) builder (3.2.4) cancancan (1.17.0) - capybara (2.18.0) + capybara (3.39.2) addressable + matrix mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) carrierwave (0.11.2) activemodel (>= 3.2.0) activesupport (>= 3.2.0) @@ -124,9 +126,11 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.2.2) + connection_pool (2.4.1) crass (1.0.6) dalli (2.7.11) database_cleaner (1.99.0) + date (3.3.4) decent_exposure (2.3.3) declarative (0.0.20) declarative-option (0.1.0) @@ -150,6 +154,8 @@ GEM faraday multi_json erubis (2.7.0) + et-orbi (1.2.7) + tzinfo execjs (2.9.0) faker (1.9.6) i18n (>= 0.7) @@ -157,6 +163,9 @@ GEM multipart-post (>= 1.2, < 3) fast_gettext (0.9.2) ffi (1.15.5) + fugit (1.9.0) + et-orbi (~> 1, >= 1.2.7) + raabro (~> 1.4) gettext (3.1.9) locale (>= 2.0.5) text (>= 1.3.0) @@ -192,8 +201,7 @@ GEM haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - hashie (3.6.0) - hike (1.2.3) + hashie (5.0.0) html2haml (2.3.0) erubis (~> 2.7.0) haml (>= 4.0) @@ -214,20 +222,22 @@ GEM rails (>= 3.0) intercom-rails (0.4.2) activesupport (> 3.0) - jasmine (2.7.0) - jasmine-core (>= 2.7.0, < 3.0.0) + jasmine (3.8.0) + jasmine-core (~> 3.8.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.99.2) + webrick + jasmine-core (3.8.0) jquery-rails (2.0.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.8.6) - json-jwt (1.12.0) + json-jwt (1.15.3) activesupport (>= 4.2) aes_key_wrap bindata + httpclient jsonapi-renderer (0.2.2) jwt (1.5.6) knockoutjs-rails (3.2.0) @@ -235,12 +245,16 @@ GEM locale (2.1.3) lodash-rails (2.4.1) railties (>= 3.1) - loofah (2.20.0) + loofah (2.21.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) machinist (1.0.6) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + matrix (0.4.2) memoist (0.16.2) mime-types (3.5.1) mime-types-data (~> 3.2015) @@ -250,14 +264,23 @@ GEM rake mini_magick (3.8.1) subexec (~> 0.2.1) - mini_mime (1.1.2) + mini_mime (1.1.5) mini_portile2 (2.4.0) - minitest (5.15.0) + minitest (5.20.0) mono_logger (1.1.2) msgpack (0.7.6) multi_json (1.15.0) multipart-post (2.3.0) mysql2 (0.3.21) + net-imap (0.4.8) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.4.0) + net-protocol netrc (0.11.0) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) @@ -265,12 +288,13 @@ GEM json rest-client oj (2.15.1) - omniauth (1.9.2) + omniauth (2.0.4) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) - omniauth-openid (1.0.1) - omniauth (~> 1.0) - rack-openid (~> 1.3.1) + rack-protection + omniauth-openid (2.0.1) + omniauth (>= 1.0, < 3.0) + rack-openid (~> 1.4.0) orm_adapter (0.5.0) os (0.9.6) paranoia (2.4.3) @@ -279,8 +303,9 @@ GEM po_to_json (0.1.0) json (>= 1.6.0) polyglot (0.3.5) - public_suffix (4.0.7) + public_suffix (5.0.4) puma (3.11.4) + raabro (1.4.0) rack (1.6.13) rack-oauth2 (1.12.0) activesupport @@ -288,7 +313,7 @@ GEM httpclient json-jwt (>= 1.11.0) rack (< 2.1) - rack-openid (1.3.1) + rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-protection (1.5.5) @@ -313,7 +338,7 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) railties (4.2.11.3) actionpack (= 4.2.11.3) @@ -321,9 +346,13 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (13.1.0) - redis (3.3.5) - redis-namespace (1.6.0) - redis (>= 3.0.4) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool + redis-namespace (1.11.0) + redis (>= 4) + regexp_parser (2.8.3) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -331,17 +360,16 @@ GEM responders (2.4.1) actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) - resque (1.27.4) + resque (2.6.0) mono_logger (~> 1.0) multi_json (~> 1.0) - redis-namespace (~> 1.3) + redis-namespace (~> 1.6) sinatra (>= 0.9.2) - vegas (~> 0.1.2) - resque-scheduler (3.0.0) + resque-scheduler (4.10.2) mono_logger (~> 1.0) - redis (~> 3.0) - resque (~> 1.25) - rufus-scheduler (~> 2.0) + redis (>= 3.3) + resque (>= 1.27) + rufus-scheduler (~> 3.2, != 3.3) resque_spec (0.18.1) resque (>= 1.26.0) rspec-core (>= 3.0.0) @@ -376,14 +404,18 @@ GEM ruby_parser (3.19.2) sexp_processor (~> 4.16) rubyzip (1.3.0) - rufus-scheduler (2.0.24) - tzinfo (>= 0.3.22) - sass (3.2.19) - sass-rails (4.0.5) - railties (>= 4.0.0, < 5.0) - sass (~> 3.2.2) - sprockets (~> 2.8, < 3.0) - sprockets-rails (~> 2.0) + rufus-scheduler (3.9.1) + fugit (~> 1.1, >= 1.1.6) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) @@ -407,21 +439,20 @@ GEM spring (1.7.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (2.12.5) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets (4.1.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.2) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) subexec (0.2.3) text (1.3.1) thor (0.20.3) thread_safe (0.3.6) - tilt (1.4.1) + tilt (2.3.0) timecop (0.9.8) + timeout (0.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -435,10 +466,9 @@ GEM unf_ext unf_ext (0.0.8.2) uuidtools (2.2.0) - vegas (0.1.11) - rack (>= 1.0.0) warden (1.2.7) rack (>= 1.0) + webrick (1.8.1) will_paginate (3.3.1) xpath (3.2.0) nokogiri (~> 1.8) @@ -455,7 +485,7 @@ DEPENDENCIES alto_guisso_rails! breadcrumbs_on_rails cancancan (~> 1.9) - capybara (~> 2.18) + capybara (~> 3.39) carrierwave coffee-rails (~> 4.0.1) dalli (~> 2.7) @@ -474,11 +504,10 @@ DEPENDENCIES instedd-rails (~> 0.0.24) instedd_telemetry! intercom-rails - jasmine (~> 2.7.0) + jasmine (~> 3.8.0) jquery-rails (~> 2.0.2) knockoutjs-rails (~> 3.2.0) lodash-rails - loofah (= 2.20.0) machinist (= 1.0.6) mini_magick msgpack (~> 0.7.5) @@ -486,20 +515,20 @@ DEPENDENCIES nokogiri nuntium_api (~> 0.13) oj (~> 2.15.0) - omniauth (~> 1.2) - omniauth-openid (~> 1.0) + omniauth (~> 2.0) + omniauth-openid (~> 2.0) paranoia (~> 2.0) puma (~> 3.11.4) rails (~> 4.2.11) rails-assets-knockout-sortable! - redis (~> 3.1) - resque (~> 1.25) - resque-scheduler (~> 3.0.0) + redis (~> 5.0) + resque (~> 2.6) + resque-scheduler (~> 4.10.2) resque_spec rspec-rails (~> 3.4.0) rspec-retry rubyzip (= 1.3.0) - sass-rails (~> 4.0.1) + sass-rails (~> 6.0.0) selenium-webdriver (= 3.141.0) shoulda-matchers simplecov