From 278d8a155482ffb141512627c468bb01010524fb Mon Sep 17 00:00:00 2001 From: ollizeyen Date: Mon, 9 Aug 2021 13:44:50 +0200 Subject: [PATCH 1/2] Bump rails to 6.1 --- pundit-resources.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pundit-resources.gemspec b/pundit-resources.gemspec index fbc2a63..b338e70 100644 --- a/pundit-resources.gemspec +++ b/pundit-resources.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.add_dependency "activesupport" spec.add_dependency "jsonapi-resources" spec.add_dependency "pundit" - spec.add_dependency "rails", ">= 4.2.1", "< 5.1" + spec.add_dependency 'rails', '~> 6.1', '>= 6.1.4' spec.add_development_dependency "bundler", "~> 1.11" spec.add_development_dependency "rake", "~> 10.0" From 6a255b394a6165bb98e01a1fed91a71b4ad26d1d Mon Sep 17 00:00:00 2001 From: ollizeyen Date: Mon, 9 Aug 2021 14:47:04 +0200 Subject: [PATCH 2/2] Adopt latest pundit wording --- lib/pundit/resource_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pundit/resource_controller.rb b/lib/pundit/resource_controller.rb index 5f3c505..45ad0bc 100644 --- a/lib/pundit/resource_controller.rb +++ b/lib/pundit/resource_controller.rb @@ -10,8 +10,8 @@ module ResourceController JSONAPI.configure do |config| error = Pundit::NotAuthorizedError - unless config.exception_class_whitelist.include? error - config.exception_class_whitelist << error + unless config.exception_class_allowlist.include? error + config.exception_class_allowlist << error config.use_relationship_reflection = true end end