From adda084a8348f048367acd204b94a52b98916517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Edstr=C3=B6m?= Date: Sat, 17 Oct 2020 01:18:49 +0900 Subject: [PATCH 1/2] Fix 2.7 deprecation warning in middleware/stack --- lib/grape/middleware/stack.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/grape/middleware/stack.rb b/lib/grape/middleware/stack.rb index b725e8787..a11869da8 100644 --- a/lib/grape/middleware/stack.rb +++ b/lib/grape/middleware/stack.rb @@ -70,9 +70,9 @@ def [](i) middlewares[i] end - def insert(index, *args, &block) + def insert(index, *args, **kwargs, &block) index = assert_index(index, :before) - middleware = self.class::Middleware.new(*args, &block) + middleware = self.class::Middleware.new(*args, **kwargs, &block) middlewares.insert(index, middleware) end @@ -83,8 +83,8 @@ def insert_after(index, *args, &block) insert(index + 1, *args, &block) end - def use(*args, &block) - middleware = self.class::Middleware.new(*args, &block) + def use(*args, **kwargs, &block) + middleware = self.class::Middleware.new(*args, **kwargs, &block) middlewares.push(middleware) end From c9a77d05d59d8f989ae9cbf44d2c0b6841a3f885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Edstr=C3=B6m?= Date: Sat, 17 Oct 2020 02:02:29 +0900 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebddceccb..76c167eef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Your contribution here. * [#2115](https://github.com/ruby-grape/grape/pull/2115): Fix declared_params regression with multiple allowed types - [@stanhu](https://github.com/stanhu). +* [#2123](https://github.com/ruby-grape/grape/pull/2123): Fix 2.7 deprecation warning in middleware/stack - [@Legogris](https://github.com/Legogris). ### 1.5.0 (2020/10/05)