From a87109a27d0bacae61c67e1f6deec02c3396bc14 Mon Sep 17 00:00:00 2001
From: Eric Proulx <eproulx@petalmd.com>
Date: Sat, 30 Nov 2024 09:59:16 -0500
Subject: [PATCH 1/4] Add Rails 8.0 gemfile Add Rails 8.0 test matrix

---
 .github/workflows/test.yml | 9 +++++++++
 gemfiles/rails_8_0.gemfile | 6 ++++++
 2 files changed, 15 insertions(+)
 create mode 100644 gemfiles/rails_8_0.gemfile

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6951c9432d..e326cba767 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,11 +57,20 @@ jobs:
           - ruby: '3.3'
             gemfile: gemfiles/rails_7_2.gemfile
             specs: 'spec/integration/rails'
+          - ruby: '3.3'
+            gemfile: gemfiles/rails_8_0.gemfile
+            specs: 'spec/integration/rails'
         exclude:
           - ruby: '2.7'
             gemfile: gemfiles/rails_7_2.gemfile
           - ruby: '3.0'
             gemfile: gemfiles/rails_7_2.gemfile
+          - ruby: '2.7'
+            gemfile: gemfiles/rails_8_0.gemfile
+          - ruby: '3.0'
+            gemfile: gemfiles/rails_8_0.gemfile
+          - ruby: '3.1'
+            gemfile: gemfiles/rails_8_0.gemfile
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
diff --git a/gemfiles/rails_8_0.gemfile b/gemfiles/rails_8_0.gemfile
new file mode 100644
index 0000000000..715b61502d
--- /dev/null
+++ b/gemfiles/rails_8_0.gemfile
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+eval_gemfile '../Gemfile'
+
+gem 'rails', '~> 8.0'
+gem 'tzinfo-data', require: false

From 47045d6fd348869ff2afac19e7ece634f88564ae Mon Sep 17 00:00:00 2001
From: Eric Proulx <eproulx@petalmd.com>
Date: Sat, 30 Nov 2024 10:02:56 -0500
Subject: [PATCH 2/4] Fix Rails 8.0 test

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e326cba767..c01a3f2cc5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
-        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rack_3_1.gemfile, gemfiles/rails_6_0.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_7_1.gemfile, gemfiles/rails_7_2.gemfile]
+        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rack_3_1.gemfile, gemfiles/rails_6_0.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_7_1.gemfile, gemfiles/rails_7_2.gemfile, gemfiles/rails_8_0.gemfile]
         specs: ['spec --exclude-pattern=spec/integration/**/*_spec.rb']
         include:
           - ruby: '2.7'

From 0759833dcfe6ee698c13b5bf008ae8544209423e Mon Sep 17 00:00:00 2001
From: Eric Proulx <eproulx@petalmd.com>
Date: Sat, 30 Nov 2024 10:30:11 -0500
Subject: [PATCH 3/4] Removes rails_6_0.gemfile from CI

---
 .github/workflows/test.yml | 2 +-
 gemfiles/rails_6_0.gemfile | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 gemfiles/rails_6_0.gemfile

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c01a3f2cc5..a7710f2aa8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
-        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rack_3_1.gemfile, gemfiles/rails_6_0.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_7_1.gemfile, gemfiles/rails_7_2.gemfile, gemfiles/rails_8_0.gemfile]
+        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rack_3_1.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_7_1.gemfile, gemfiles/rails_7_2.gemfile, gemfiles/rails_8_0.gemfile]
         specs: ['spec --exclude-pattern=spec/integration/**/*_spec.rb']
         include:
           - ruby: '2.7'
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
deleted file mode 100644
index 0e775d7850..0000000000
--- a/gemfiles/rails_6_0.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-eval_gemfile '../Gemfile'
-
-gem 'rails', '~> 6.0.0'
-gem 'tzinfo-data', require: false

From 76c110b1f81c3b9d3a2a2d5057e19b44f76c9318 Mon Sep 17 00:00:00 2001
From: Eric Proulx <eproulx@petalmd.com>
Date: Sat, 30 Nov 2024 10:30:55 -0500
Subject: [PATCH 4/4] Add CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d758f3a779..d274b058ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * [#2502](https://github.com/ruby-grape/grape/pull/2502): Remove deprecation `options` in `desc` - [@ericproulx](https://github.com/ericproulx).
 * [#2512](https://github.com/ruby-grape/grape/pull/2512): Optimize hash alloc - [@ericproulx](https://github.com/ericproulx).
 * [#2513](https://github.com/ruby-grape/grape/pull/2513): Optimize Grape::Path - [@ericproulx](https://github.com/ericproulx).
+* [#2514](https://github.com/ruby-grape/grape/pull/2514): Add rails 8.0 to CI - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 
 #### Fixes