From 26522bb07f1c4a0506af97eca889d4feaefbeb48 Mon Sep 17 00:00:00 2001 From: Eric Proulx Date: Sun, 19 Jan 2025 21:44:15 +0100 Subject: [PATCH 1/3] require logger for concurrent-ruby 1.3.5 --- lib/grape.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/grape.rb b/lib/grape.rb index 963e37364..557b6603b 100644 --- a/lib/grape.rb +++ b/lib/grape.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require 'logger' require 'active_support' require 'active_support/concern' require 'active_support/configurable' From c28f29a3669947d35e541b286cc31fda4bd8a864 Mon Sep 17 00:00:00 2001 From: Eric Proulx Date: Sun, 19 Jan 2025 21:47:01 +0100 Subject: [PATCH 2/3] Remove duplicate require 'logger' --- lib/grape.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/grape.rb b/lib/grape.rb index 557b6603b..ed6f9058a 100644 --- a/lib/grape.rb +++ b/lib/grape.rb @@ -34,7 +34,6 @@ require 'dry-types' require 'forwardable' require 'json' -require 'logger' require 'mustermann/grape' require 'pathname' require 'rack' From d487c8c1bd5c6455c4c2198a39ac0069eaccf68f Mon Sep 17 00:00:00 2001 From: Eric Proulx Date: Sun, 19 Jan 2025 21:48:36 +0100 Subject: [PATCH 3/3] Add CHANGELOG.md entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13b1b0913..01a5d1063 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ * [#2506](https://github.com/ruby-grape/grape/pull/2506): Fix fetch_formatter api_format - [@ericproulx](https://github.com/ericproulx). * [#2507](https://github.com/ruby-grape/grape/pull/2507): Fix type: Set with values - [@nikolai-b](https://github.com/nikolai-b). * [#2510](https://github.com/ruby-grape/grape/pull/2510): Fix ContractScope's validator inheritance - [@ericproulx](https://github.com/ericproulx). +* [#2525](https://github.com/ruby-grape/grape/pull/2525): Require logger before active_support` - [@ericproulx](https://github.com/ericproulx). * Your contribution here. ### 2.2.0 (2024-09-14)