Skip to content

Commit db16569

Browse files
committed
Merge master
2 parents 1a70759 + 926c28d commit db16569

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* [#2507](https://github.com/ruby-grape/grape/pull/2507): Fix type: Set with values - [@nikolai-b](https://github.com/nikolai-b).
2121
* [#2510](https://github.com/ruby-grape/grape/pull/2510): Fix ContractScope's validator inheritance - [@ericproulx](https://github.com/ericproulx).
2222
* [#2521](https://github.com/ruby-grape/grape/pull/2521): Fixed typo in README - [@datpmt](https://github.com/datpmt).
23+
* [#2525](https://github.com/ruby-grape/grape/pull/2525): Require logger before active_support - [@ericproulx](https://github.com/ericproulx).
2324
* [#2524](https://github.com/ruby-grape/grape/pull/2524): Fix validators bad encoding - [@ericproulx](https://github.com/ericproulx).
2425
* Your contribution here.
2526

lib/grape.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# frozen_string_literal: true
22

3+
require 'logger'
34
require 'active_support'
45
require 'active_support/concern'
56
require 'active_support/configurable'
@@ -33,7 +34,6 @@
3334
require 'dry-types'
3435
require 'forwardable'
3536
require 'json'
36-
require 'logger'
3737
require 'mustermann/grape'
3838
require 'pathname'
3939
require 'rack'

0 commit comments

Comments
 (0)