Rails 6.1 in next version of running app (#4135)

* 6.1 in next version of app * update active_interaction * update pg in next.lock * update run tests for next version * Update Gemfile.next.lock
zooniverse · Mar 9, 2023 · d845276 · d845276
1 parent 4964c7d
commit d845276
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 97 deletions.
diff --git a/.github/workflows/run_tests_CI.yml b/.github/workflows/run_tests_CI.yml
@@ -25,7 +25,7 @@ jobs:
  matrix:
  gemfile:
  - Gemfile
- # - Gemfile.next
+ - Gemfile.next
  ruby:
  - 2.7
  spec-commands:

diff --git a/Gemfile b/Gemfile
@@ -43,7 +43,7 @@ gem 'puma', '~> 6.1.1'
 gem 'pundit', '~> 2.3.0'
 gem 'rack-cors', '~> 1.0', require: 'rack/cors'
 if next?
- gem 'rails', '~> 6.0'
+ gem 'rails', '~> 6.1'
 else
  gem 'rails', '~> 6.0'
 end

diff --git a/Gemfile.next.lock b/Gemfile.next.lock
@@ -12,73 +12,78 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
- actioncable (6.0.6.1)
- actionpack (= 6.0.6.1)
+ actioncable (6.1.7.2)
+ actionpack (= 6.1.7.2)
+ activesupport (= 6.1.7.2)
  nio4r (~> 2.0)
  websocket-driver (>= 0.6.1)
- actionmailbox (6.0.6.1)
- actionpack (= 6.0.6.1)
- activejob (= 6.0.6.1)
- activerecord (= 6.0.6.1)
- activestorage (= 6.0.6.1)
- activesupport (= 6.0.6.1)
+ actionmailbox (6.1.7.2)
+ actionpack (= 6.1.7.2)
+ activejob (= 6.1.7.2)
+ activerecord (= 6.1.7.2)
+ activestorage (= 6.1.7.2)
+ activesupport (= 6.1.7.2)
  mail (>= 2.7.1)
- actionmailer (6.0.6.1)
- actionpack (= 6.0.6.1)
- actionview (= 6.0.6.1)
- activejob (= 6.0.6.1)
+ actionmailer (6.1.7.2)
+ actionpack (= 6.1.7.2)
+ actionview (= 6.1.7.2)
+ activejob (= 6.1.7.2)
+ activesupport (= 6.1.7.2)
  mail (~> 2.5, >= 2.5.4)
  rails-dom-testing (~> 2.0)
- actionpack (6.0.6.1)
- actionview (= 6.0.6.1)
- activesupport (= 6.0.6.1)
- rack (~> 2.0, >= 2.0.8)
+ actionpack (6.1.7.2)
+ actionview (= 6.1.7.2)
+ activesupport (= 6.1.7.2)
+ rack (~> 2.0, >= 2.0.9)
  rack-test (>= 0.6.3)
  rails-dom-testing (~> 2.0)
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.0.6.1)
- actionpack (= 6.0.6.1)
- activerecord (= 6.0.6.1)
- activestorage (= 6.0.6.1)
- activesupport (= 6.0.6.1)
+ actiontext (6.1.7.2)
+ actionpack (= 6.1.7.2)
+ activerecord (= 6.1.7.2)
+ activestorage (= 6.1.7.2)
+ activesupport (= 6.1.7.2)
  nokogiri (>= 1.8.5)
- actionview (6.0.6.1)
- activesupport (= 6.0.6.1)
+ actionview (6.1.7.2)
+ activesupport (= 6.1.7.2)
  builder (~> 3.1)
  erubi (~> 1.4)
  rails-dom-testing (~> 2.0)
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
- active_interaction (3.8.3)
- activemodel (>= 4, < 7)
+ active_interaction (5.2.0)
+ activemodel (>= 5.2, < 8)
+ activesupport (>= 5.2, < 8)
  active_model_serializers (0.10.13)
  actionpack (>= 4.1, < 7.1)
  activemodel (>= 4.1, < 7.1)
  case_transform (>= 0.2)
  jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
- active_record_extended (3.1.0)
- activerecord (>= 5.2, < 7.1.0)
+ active_record_extended (3.2.1)
+ activerecord (>= 5.2, < 7.2.0)
  pg (< 3.0)
- activejob (6.0.6.1)
- activesupport (= 6.0.6.1)
+ activejob (6.1.7.2)
+ activesupport (= 6.1.7.2)
  globalid (>= 0.3.6)
- activemodel (6.0.6.1)
- activesupport (= 6.0.6.1)
- activerecord (6.0.6.1)
- activemodel (= 6.0.6.1)
- activesupport (= 6.0.6.1)
+ activemodel (6.1.7.2)
+ activesupport (= 6.1.7.2)
+ activerecord (6.1.7.2)
+ activemodel (= 6.1.7.2)
+ activesupport (= 6.1.7.2)
  activerecord-import (1.4.1)
  activerecord (>= 4.2)
- activestorage (6.0.6.1)
- actionpack (= 6.0.6.1)
- activejob (= 6.0.6.1)
- activerecord (= 6.0.6.1)
+ activestorage (6.1.7.2)
+ actionpack (= 6.1.7.2)
+ activejob (= 6.1.7.2)
+ activerecord (= 6.1.7.2)
+ activesupport (= 6.1.7.2)
  marcel (~> 1.0)
- activesupport (6.0.6.1)
+ mini_mime (>= 1.1.0)
+ activesupport (6.1.7.2)
  concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- zeitwerk (~> 2.2, >= 2.2.2)
+ i18n (>= 1.6, < 2)
+ minitest (>= 5.1)
+ tzinfo (~> 2.0)
+ zeitwerk (~> 2.3)
  addressable (2.8.1)
  public_suffix (>= 2.0.2, < 6.0)
  aggregate (0.2.3)
@@ -124,7 +129,7 @@ GEM
  deep_cloneable (3.2.0)
  activerecord (>= 3.1.0, < 8)
  deprecate (0.0.0)
- devise (4.8.1)
+ devise (4.9.0)
  bcrypt (~> 3.0)
  orm_adapter (~> 0.1)
  railties (>= 4.1.0)
@@ -188,7 +193,7 @@ GEM
  rack-protection (>= 1.5.3, <= 4.0.0)
  sanitize (< 7)
  formatador (1.1.0)
- fugit (1.7.2)
+ fugit (1.8.1)
  et-orbi (~> 1, >= 1.2.7)
  raabro (~> 1.4)
  globalid (1.1.0)
@@ -213,7 +218,7 @@ GEM
  rspec (>= 2.99.0, < 4.0)
  hashdiff (1.0.1)
  hashie (5.0.0)
- honeybadger (5.0.2)
+ honeybadger (5.2.0)
  http-accept (1.7.0)
  http-cookie (1.0.5)
  domain_name (~> 0.5)
@@ -247,7 +252,7 @@ GEM
  aggregate (~> 0.2.2)
  faraday
  libv8-node (15.14.0.1)
- listen (3.7.1)
+ listen (3.8.0)
  rb-fsevent (~> 0.10, >= 0.10.3)
  rb-inotify (~> 0.9, >= 0.9.10)
  lograge (0.12.0)
@@ -259,7 +264,7 @@ GEM
  crass (~> 1.0.2)
  nokogiri (>= 1.5.9)
  lumberjack (1.2.8)
- mail (2.8.0.1)
+ mail (2.8.1)
  mini_mime (>= 0.1.1)
  net-imap
  net-pop
@@ -329,17 +334,17 @@ GEM
  parallel (1.22.1)
  parser (3.1.2.1)
  ast (~> 2.4.1)
- pg (0.21.0)
+ pg (1.4.6)
  pg_search (2.3.6)
  activerecord (>= 5.2)
  activesupport (>= 5.2)
  pry (0.14.1)
  coderay (~> 1.1)
  method_source (~> 1.0)
  public_suffix (5.0.0)
- puma (6.0.2)
+ puma (6.1.1)
  nio4r (~> 2.0)
- pundit (2.2.0)
+ pundit (2.3.0)
  activesupport (>= 3.0.0)
  raabro (1.4.0)
  racc (1.6.1)
@@ -350,32 +355,32 @@ GEM
  rack
  rack-test (2.0.2)
  rack (>= 1.3)
- rails (6.0.6.1)
- actioncable (= 6.0.6.1)
- actionmailbox (= 6.0.6.1)
- actionmailer (= 6.0.6.1)
- actionpack (= 6.0.6.1)
- actiontext (= 6.0.6.1)
- actionview (= 6.0.6.1)
- activejob (= 6.0.6.1)
- activemodel (= 6.0.6.1)
- activerecord (= 6.0.6.1)
- activestorage (= 6.0.6.1)
- activesupport (= 6.0.6.1)
- bundler (>= 1.3.0)
- railties (= 6.0.6.1)
+ rails (6.1.7.2)
+ actioncable (= 6.1.7.2)
+ actionmailbox (= 6.1.7.2)
+ actionmailer (= 6.1.7.2)
+ actionpack (= 6.1.7.2)
+ actiontext (= 6.1.7.2)
+ actionview (= 6.1.7.2)
+ activejob (= 6.1.7.2)
+ activemodel (= 6.1.7.2)
+ activerecord (= 6.1.7.2)
+ activestorage (= 6.1.7.2)
+ activesupport (= 6.1.7.2)
+ bundler (>= 1.15.0)
+ railties (= 6.1.7.2)
  sprockets-rails (>= 2.0.0)
  rails-dom-testing (2.0.3)
  activesupport (>= 4.2.0)
  nokogiri (>= 1.6)
  rails-html-sanitizer (1.4.4)
  loofah (~> 2.19, >= 2.19.1)
- railties (6.0.6.1)
- actionpack (= 6.0.6.1)
- activesupport (= 6.0.6.1)
+ railties (6.1.7.2)
+ actionpack (= 6.1.7.2)
+ activesupport (= 6.1.7.2)
  method_source
- rake (>= 0.8.7)
- thor (>= 0.20.3, < 2.0)
+ rake (>= 12.2)
+ thor (~> 1.0)
  rainbow (3.0.0)
  rake (13.0.6)
  ranked-model (0.4.8)
@@ -387,9 +392,9 @@ GEM
  regexp_parser (2.6.0)
  request_store (1.5.1)
  rack (>= 1.4)
- responders (3.0.1)
- actionpack (>= 5.0)
- railties (>= 5.0)
+ responders (3.1.0)
+ actionpack (>= 5.2)
+ railties (>= 5.2)
  rest-client (2.1.0)
  http-accept (>= 1.7.0, < 2.0)
  http-cookie (>= 1.0.2, < 2.0)
@@ -411,14 +416,14 @@ GEM
  rspec-mocks (3.12.0)
  diff-lcs (>= 1.2.0, < 2.0)
  rspec-support (~> 3.12.0)
- rspec-rails (5.1.2)
- actionpack (>= 5.2)
- activesupport (>= 5.2)
- railties (>= 5.2)
- rspec-core (~> 3.10)
- rspec-expectations (~> 3.10)
- rspec-mocks (~> 3.10)
- rspec-support (~> 3.10)
+ rspec-rails (6.0.1)
+ actionpack (>= 6.1)
+ activesupport (>= 6.1)
+ railties (>= 6.1)
+ rspec-core (~> 3.11)
+ rspec-expectations (~> 3.11)
+ rspec-mocks (~> 3.11)
+ rspec-support (~> 3.11)
  rspec-support (3.12.0)
  rubocop (0.91.1)
  parallel (~> 1.10)
@@ -456,8 +461,8 @@ GEM
  sidekiq-congestion (0.1.1)
  congestion (~> 0.1)
  sidekiq (>= 3.0)
- sidekiq-cron (1.8.0)
- fugit (~> 1)
+ sidekiq-cron (1.9.1)
+ fugit (~> 1.8)
  sidekiq (>= 4.2.1)
  sidekiq-unique-jobs (7.1.29)
  brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
@@ -481,18 +486,17 @@ GEM
  standby (4.0.0)
  activerecord (>= 3.0.0)
  stringex (2.8.5)
- strong_migrations (1.4.0)
+ strong_migrations (1.4.3)
  activerecord (>= 5.2)
  ten_years_rails (0.2.0)
  actionview
  activesupport
  colorize (>= 0.8.1)
  rest-client (>= 2.0.2)
  thor (1.2.1)
- thread_safe (0.3.6)
- timeout (0.3.1)
- tzinfo (1.2.10)
- thread_safe (~> 0.1)
+ timeout (0.3.2)
+ tzinfo (2.0.6)
+ concurrent-ruby (~> 1.0)
  uglifier (4.2.0)
  execjs (>= 0.3.0, < 3)
  unf (0.1.4)
@@ -524,7 +528,7 @@ PLATFORMS
  ruby
 
 DEPENDENCIES
- active_interaction (~> 3.8.3)
+ active_interaction
  active_model_serializers
  active_record_extended
  activerecord-import (~> 1.4)
@@ -546,12 +550,12 @@ DEPENDENCIES
  graphiql-rails
  graphql
  guard-rspec
- honeybadger (~> 5.0)
+ honeybadger (~> 5.2)
  httparty
  jquery-rails (~> 4.5)
  json-schema (~> 2.8)
  librato-metrics (~> 2.1.2)
- listen (~> 3.7)
+ listen (~> 3.8)
  lograge
  mime-types
  mini_racer
@@ -562,13 +566,13 @@ DEPENDENCIES
  omniauth-google-oauth2
  p3p (~> 2.0)
  panoptes-client
- pg (~> 0.21)
+ pg (~> 1.4)
  pg_search
  pry
- puma (~> 6.0.2)
- pundit (~> 2.2.0)
+ puma (~> 6.1.1)
+ pundit (~> 2.3.0)
  rack-cors (~> 1.0)
- rails (~> 6.0)
+ rails (~> 6.1)
  ranked-model (~> 0.4.8)
  restpack_serializer!
  rspec