From 4949257fb51e0e86483e3ebd8143e7551adaa9a0 Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Wed, 25 Jan 2023 14:34:06 -0600 Subject: [PATCH] Updating Restpack serializer panoptes-api-version to support up to activesupport/record 7.1 (#4093) * test against restpack serializer branch with activerecord/support < 7.1 support * update restpack_serializer to newest commit * pull from panoptes-api-version branch --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- Gemfile.next.lock | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 143784dcd..e23dd78da 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ else gem 'rails', '~> 5.2' end gem 'ranked-model', '~> 0.4.8' -gem 'restpack_serializer', git: 'https://github.com/zooniverse/restpack_serializer.git', branch: 'panoptes-api-version', ref: 'cef0969cef' +gem 'restpack_serializer', git: 'https://github.com/zooniverse/restpack_serializer.git', branch: 'panoptes-api-version', ref: '5f1ef6c2b2' gem 'scientist', '~> 1.6.3' gem 'sidekiq', '< 7' gem 'sidekiq-congestion', '~> 0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 65424e311..a8ea7ec1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://github.com/zooniverse/restpack_serializer.git - revision: cef0969cef79a31de774e71c63de2a934c9e9f7f - ref: cef0969cef + revision: 5f1ef6c2b230f291dd3b30b9c213bbeb64617801 + ref: 5f1ef6c2b2 branch: panoptes-api-version specs: restpack_serializer (0.5.9) - activerecord (>= 4.0.3, < 6.0) - activesupport (>= 4.0.3, < 6.0) + activerecord (>= 5.2, < 7.1) + activesupport (>= 5.2, < 7.1) kaminari (< 2.0) GEM diff --git a/Gemfile.next.lock b/Gemfile.next.lock index a0ca8e2db..76324804c 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -1,12 +1,12 @@ GIT remote: https://github.com/zooniverse/restpack_serializer.git - revision: cef0969cef79a31de774e71c63de2a934c9e9f7f - ref: cef0969cef + revision: 5f1ef6c2b230f291dd3b30b9c213bbeb64617801 + ref: 5f1ef6c2b2 branch: panoptes-api-version specs: restpack_serializer (0.5.9) - activerecord (>= 4.0.3, < 6.0) - activesupport (>= 4.0.3, < 6.0) + activerecord (>= 5.2, < 7.1) + activesupport (>= 5.2, < 7.1) kaminari (< 2.0) GEM