diff --git a/.ruby-version b/.ruby-version index 0cadbc1e..ecd7ee50 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.5 +2.5.8 diff --git a/.travis.yml b/.travis.yml index 4c73dd49..cd6683e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ addons: language: ruby cache: bundler rvm: + - 2.5 + - 2.6 branches: except: - /^depfu/.*$/ @@ -42,4 +44,4 @@ env: - TEST_SUITE=controllers - TEST_SUITE=rest matrix: - fast_finish: true + fast_finish: false diff --git a/Gemfile b/Gemfile index b25cf8ad..afae26db 100644 --- a/Gemfile +++ b/Gemfile @@ -2,14 +2,13 @@ source 'https://rubygems.org' -ruby '~> 2.5.0' +# ruby '~> 2.5.0' # rails-assets requires >= 1.8.4 if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') abort "Bundler version >= 1.8.4 is required" end -# as web framework gem 'rails', '~> 5.2' # Use Puma as the app server @@ -142,7 +141,9 @@ gem 'rqrcode' gem 'axlsx', git: 'https://github.com/randym/axlsx.git' gem 'axlsx_rails' -gem 'sentry-raven' +gem 'sentry-ruby' +gem 'sentry-rails' +gem 'sentry-delayed_job' # to make links faster gem 'turbolinks' diff --git a/Gemfile.lock b/Gemfile.lock index 0aaa057c..9fce2848 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,25 +13,25 @@ GEM remote: https://rails-assets.org/ specs: Ascii85 (1.0.3) - actioncable (5.2.4.4) - actionpack (= 5.2.4.4) + actioncable (5.2.4.5) + actionpack (= 5.2.4.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) + actionmailer (5.2.4.5) + actionpack (= 5.2.4.5) + actionview (= 5.2.4.5) + activejob (= 5.2.4.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.4) - actionview (= 5.2.4.4) - activesupport (= 5.2.4.4) + actionpack (5.2.4.5) + actionview (= 5.2.4.5) + activesupport (= 5.2.4.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.4) - activesupport (= 5.2.4.4) + actionview (5.2.4.5) + activesupport (= 5.2.4.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -41,20 +41,20 @@ GEM activemodel (>= 4.1, < 6.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (5.2.4.4) - activesupport (= 5.2.4.4) + activejob (5.2.4.5) + activesupport (= 5.2.4.5) globalid (>= 0.3.6) - activemodel (5.2.4.4) - activesupport (= 5.2.4.4) - activerecord (5.2.4.4) - activemodel (= 5.2.4.4) - activesupport (= 5.2.4.4) + activemodel (5.2.4.5) + activesupport (= 5.2.4.5) + activerecord (5.2.4.5) + activemodel (= 5.2.4.5) + activesupport (= 5.2.4.5) arel (>= 9.0) - activestorage (5.2.4.4) - actionpack (= 5.2.4.4) - activerecord (= 5.2.4.4) + activestorage (5.2.4.5) + actionpack (= 5.2.4.5) + activerecord (= 5.2.4.5) marcel (~> 0.3.1) - activesupport (5.2.4.4) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -163,7 +163,7 @@ GEM dotenv-rails (2.7.5) dotenv (= 2.7.5) railties (>= 3.2, < 6.1) - erubi (1.9.0) + erubi (1.10.0) erubis (2.7.0) execjs (2.7.0) factory_bot (4.11.1) @@ -173,8 +173,11 @@ GEM railties (>= 3.0.0) faker (1.9.3) i18n (>= 0.7) - faraday (0.15.4) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-net_http (1.0.1) fastimage (2.1.4) feature (1.4.0) ffi (1.10.0) @@ -221,7 +224,7 @@ GEM sysexits (~> 1.1) hashdiff (0.3.7) hashery (2.1.2) - hashie (3.6.0) + hashie (4.1.0) html2haml (2.2.0) erubis (~> 2.7.0) haml (>= 4.0, < 6) @@ -230,7 +233,7 @@ GEM htmlentities (4.3.4) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.8.8) + i18n (1.8.9) concurrent-ruby (~> 1.0) i18n_data (0.8.0) inversion (1.1.1) @@ -249,7 +252,7 @@ GEM json-schema (2.8.1) addressable (>= 2.4) jsonapi-renderer (0.2.2) - jwt (2.1.0) + jwt (2.2.2) launchy (2.4.3) addressable (~> 2.3) leaflet-rails (1.5.1) @@ -265,7 +268,7 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) loggability (0.14.0) - loofah (2.7.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.12) @@ -296,41 +299,42 @@ GEM monetize (~> 1.9.0) money (~> 6.13.2) railties (>= 3.0) - multi_json (1.14.1) + multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) nenv (0.3.0) netrc (0.11.0) - nio4r (2.5.4) - nokogiri (1.11.0) + nio4r (2.5.5) + nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.9.0) - hashie (>= 3.4.6, < 3.7.0) + omniauth (1.9.1) + hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-discourse (1.0.0) omniauth (~> 1.0) - omniauth-facebook (6.0.0) + omniauth-facebook (8.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.3.0) + omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.6.1) + omniauth-google-oauth2 (0.8.1) jwt (>= 2.0) - omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.5) - omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) - omniauth (~> 1.9) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.6) + omniauth-oauth2 (1.7.1) + oauth2 (~> 1.4) + omniauth (>= 1.9, < 3) omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) @@ -381,18 +385,18 @@ GEM ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.4) - actioncable (= 5.2.4.4) - actionmailer (= 5.2.4.4) - actionpack (= 5.2.4.4) - actionview (= 5.2.4.4) - activejob (= 5.2.4.4) - activemodel (= 5.2.4.4) - activerecord (= 5.2.4.4) - activestorage (= 5.2.4.4) - activesupport (= 5.2.4.4) + rails (5.2.4.5) + actioncable (= 5.2.4.5) + actionmailer (= 5.2.4.5) + actionpack (= 5.2.4.5) + actionview (= 5.2.4.5) + activejob (= 5.2.4.5) + activemodel (= 5.2.4.5) + activerecord (= 5.2.4.5) + activestorage (= 5.2.4.5) + activesupport (= 5.2.4.5) bundler (>= 1.3.0) - railties (= 5.2.4.4) + railties (= 5.2.4.5) sprockets-rails (>= 2.0.0) rails-assets-bootstrap (3.3.6) rails-assets-jquery (>= 1.9.1, < 3) @@ -426,9 +430,9 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.2.4.4) - actionpack (= 5.2.4.4) - activesupport (= 5.2.4.4) + railties (5.2.4.5) + actionpack (= 5.2.4.5) + activesupport (= 5.2.4.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -497,6 +501,7 @@ GEM ruby-openid (2.9.2) ruby-progressbar (1.10.1) ruby-rc4 (0.1.5) + ruby2_keywords (0.0.4) ruby_dep (1.5.0) ruby_parser (3.11.0) sexp_processor (~> 4.9) @@ -520,8 +525,18 @@ GEM selenium-webdriver (3.142.6) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sentry-raven (2.13.0) - faraday (>= 0.7.6, < 1.0) + sentry-delayed_job (4.2.1) + sentry-ruby-core (~> 4.2.0) + sentry-rails (4.2.2) + rails (>= 5.0) + sentry-ruby-core (~> 4.2.0) + sentry-ruby (4.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + faraday (>= 1.0) + sentry-ruby-core (= 4.2.2) + sentry-ruby-core (4.2.2) + concurrent-ruby + faraday sexp_processor (4.11.0) shellany (0.0.1) shoulda-matchers (4.1.2) @@ -557,7 +572,7 @@ GEM stripe (> 5, < 6) sysexits (1.2.0) temple (0.8.0) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.9) timecop (0.9.1) @@ -699,7 +714,9 @@ DEPENDENCIES ruby-oembed sass-rails (>= 4.0.2) selectize-rails - sentry-raven + sentry-delayed_job + sentry-rails + sentry-ruby shoulda-matchers skylight spring-commands-rspec @@ -717,8 +734,5 @@ DEPENDENCIES webmock whenever -RUBY VERSION - ruby 2.5.5p157 - BUNDLED WITH 1.17.3 diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index b504df81..e42fcce6 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -1,4 +1,4 @@ -Raven.configure do |config| +Sentry.init do |config| + config.enabled_environments = %|production staging| config.dsn = ENV['SENTRY_DSN'] - config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s) end diff --git a/config/puma.rb b/config/puma.rb index 1d43c487..ed6fe45b 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -44,7 +44,7 @@ on_worker_boot do end lowlevel_error_handler do |ex, env| - Raven.capture_exception( + Sentry.capture_exception( ex, :message => ex.message, :extra => { :puma => env },