Merge branch 'master' into cookies_delegation

dblock · web-flow · commit c535d77ccf7f · 2025-03-28T18:38:37.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,8 @@
 * [#2537](https://github.com/ruby-grape/grape/pull/2537): Use activesupport `try` pattern - [@ericproulx](https://github.com/ericproulx).
 * [#2536](https://github.com/ruby-grape/grape/pull/2536): Update normalize_path like Rails - [@ericproulx](https://github.com/ericproulx).
 * [#2540](https://github.com/ruby-grape/grape/pull/2540): Introduce Params builder with symbolized short name - [@ericproulx](https://github.com/ericproulx).
-* [#2549](https://github.com/ruby-grape/grape/pull/2549): Delegate cookies management to Grape::Request - [@ericproulx](https://github.com/ericproulx).
+* [#2550](https://github.com/ruby-grape/grape/pull/2550): Drop ActiveSupport 6.0 - [@ericproulx](https://github.com/ericproulx).
+* [#2549](https://github.com/ruby-grape/grape/pull/2549): Delegate cookies management to `Grape::Request` - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 
 #### Fixes
diff --git a/grape.gemspec b/grape.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
     'rubygems_mfa_required' => 'true'
   }
 
-  s.add_dependency 'activesupport', '>= 6'
+  s.add_dependency 'activesupport', '>= 6.1'
   s.add_dependency 'dry-types', '>= 1.1'
   s.add_dependency 'mustermann-grape', '~> 1.1.0'
   s.add_dependency 'rack', '>= 2'

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ Gem::Specification.new do \|s\|`
`21`	`21`	`'rubygems_mfa_required' => 'true'`
`22`	`22`	`}`
`23`	`23`
`24`		`- s.add_dependency 'activesupport', '>= 6'`
	`24`	`+ s.add_dependency 'activesupport', '>= 6.1'`
`25`	`25`	`s.add_dependency 'dry-types', '>= 1.1'`
`26`	`26`	`s.add_dependency 'mustermann-grape', '~> 1.1.0'`
`27`	`27`	`s.add_dependency 'rack', '>= 2'`