From 44e4991a07f1fd9b4de6cd53d90888ded730936f Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Mon, 23 Jan 2023 08:29:54 +0100
Subject: [PATCH] PgHero CVE fix

Backport of https://github.com/mastodon/mastodon/commit/9b795a25cd7a014d8c08cc213031b55dff83bb69
---
 Gemfile                 | 2 +-
 Gemfile.lock            | 6 +++---
 lib/mastodon/version.rb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1af346093a..dd3d59d2db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem 'rack', '~> 2.2.6'
 gem 'hamlit-rails', '~> 0.2'
 gem 'pg', '~> 1.4'
 gem 'makara', '~> 0.5'
-gem 'pghero', '~> 2.8'
+gem 'pghero'
 gem 'dotenv-rails', '~> 2.8'
 
 gem 'aws-sdk-s3', '~> 1.117', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index ea764f72e0..581a34ca93 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -472,8 +472,8 @@ GEM
     pastel (0.8.0)
       tty-color (~> 0.5)
     pg (1.4.5)
-    pghero (2.8.3)
-      activerecord (>= 5)
+    pghero (3.1.0)
+      activerecord (>= 6)
     pkg-config (1.5.1)
     posix-spawn (0.3.15)
     premailer (1.18.0)
@@ -835,7 +835,7 @@ DEPENDENCIES
   ox (~> 2.14)
   parslet
   pg (~> 1.4)
-  pghero (~> 2.8)
+  pghero
   pkg-config (~> 1.5)
   posix-spawn
   premailer-rails
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e2df50d852..98c6040837 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def suffix_version
-      '+1.1.6'
+      '+1.1.7'
     end
 
     def to_a