From 442d0f8dd3fad82eee38889ea90282e97c2db281 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 24 Mar 2021 17:37:48 -0500
Subject: [PATCH] gems: remove meta_request fork.

Remove a workaround added in 2c06766c9. meta_request had a bug that
caused Rails to fail to launch under Rails 6.1. The fix was finally
merged upstream.

hxxps://github.com/dejan/rails_panel/pull/177.
---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 794ec1974..490946fc4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ end
 group :development do
   gem 'rubocop'
   gem 'rubocop-rails'
-  gem 'meta_request', git: "https://github.com/alpaca-tc/rails_panel", branch: "support_rails6_1"
+  gem 'meta_request'
   gem 'rack-mini-profiler'
   gem 'stackprof'
   gem 'flamegraph'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2be99a1a0..887440e15 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/alpaca-tc/rails_panel
-  revision: 4133c4ee18d5bf6a98c5893c8cbe09c26b78a9de
-  branch: support_rails6_1
-  specs:
-    meta_request (0.7.2)
-      rack-contrib (>= 1.1, < 3)
-      railties (>= 3.0.0, < 7)
-
 GIT
   remote: https://github.com/danbooru/http-cookie
   revision: 382d8a641e4df226e0e7b0d2bfaeadb2fe71dd84
@@ -269,6 +260,9 @@ GEM
       mimemagic (~> 0.3.2)
     memoist (0.16.2)
     memory_profiler (1.0.0)
+    meta_request (0.7.2)
+      rack-contrib (>= 1.1, < 3)
+      railties (>= 3.0.0, < 7)
     method_source (1.0.0)
     mimemagic (0.3.6)
     mini_mime (1.0.2)
@@ -521,7 +515,7 @@ DEPENDENCIES
   mail
   memoist
   memory_profiler
-  meta_request!
+  meta_request
   minitest-ci
   minitest-reporters
   mocha