From f117196c131fb2ec7852cc3c18f6ef6485386784 Mon Sep 17 00:00:00 2001
From: Pat Allan <pat@freelancing-gods.com>
Date: Sun, 17 Sep 2023 11:37:44 +0300
Subject: [PATCH] chore: switch back to gem releases instead of forks

---
 Gemfile      |  8 ++------
 Gemfile.lock | 40 ++++++++++++++--------------------------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index db5e261..aa7744d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,9 +15,7 @@ gem "turbolinks", "~> 5"
 gem "webpacker", "6.0.0.rc.6"
 
 gem "bootsnap", ">= 1.4.2", :require => false
-gem "decent_exposure",
-  :git    => "https://github.com/pat/decent_exposure.git",
-  :branch => "ruby-3.0-support"
+gem "decent_exposure"
 gem "devise"
 gem "faraday"
 gem "invisible_captcha"
@@ -28,9 +26,7 @@ gem "omniauth"
 gem "omniauth-rails_csrf_protection"
 gem "postmark-rails"
 gem "premailer-rails"
-gem "rspotify",
-  :git    => "https://github.com/pat/rspotify.git",
-  :branch => "chore/unpin-addressable"
+gem "rspotify"
 gem "rubocop"
 gem "rubocop-performance"
 gem "rubocop-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1158341..dc1659c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,24 +8,6 @@ GIT
       faraday_middleware
       hashie (>= 3.2.0)
 
-GIT
-  remote: https://github.com/pat/decent_exposure.git
-  revision: b65784f72c99c14e60002813dc6875c5be6f752b
-  branch: ruby-3.0-support
-  specs:
-    decent_exposure (3.0.2)
-      activesupport (>= 4.0)
-
-GIT
-  remote: https://github.com/pat/rspotify.git
-  revision: 1edbd843e9ba031787207e32655e452fb6636ca7
-  branch: chore/unpin-addressable
-  specs:
-    rspotify (2.10.2)
-      addressable (>= 2.5.2)
-      omniauth-oauth2 (>= 1.6)
-      rest-client (~> 2.0.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -125,6 +107,8 @@ GEM
     css_parser (1.12.0)
       addressable
     date (3.3.3)
+    decent_exposure (3.0.4)
+      activesupport (>= 4.0)
     devise (4.9.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -180,7 +164,7 @@ GEM
     invisible_captcha (2.1.0)
       rails (>= 5.2)
     json (2.6.3)
-    jwt (2.5.0)
+    jwt (2.7.1)
     language_server-protocol (3.17.0.3)
     lastfm (1.27.4)
       httparty
@@ -196,9 +180,9 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.0808)
     mini_mime (1.1.5)
     mini_portile2 (2.8.4)
     minitest (5.20.0)
@@ -260,8 +244,8 @@ GEM
       nio4r (~> 2.0)
     racc (1.7.1)
     rack (2.2.8)
-    rack-protection (3.0.5)
-      rack
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-proxy (0.7.4)
       rack
     rack-test (2.1.0)
@@ -322,6 +306,10 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.12.0)
+    rspotify (2.12.0)
+      addressable (~> 2.8.0)
+      omniauth-oauth2 (>= 1.6)
+      rest-client (~> 2.0.2)
     rubocop (1.56.3)
       base64 (~> 0.1.1)
       json (~> 2.3)
@@ -379,7 +367,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
-    version_gem (1.1.1)
+    version_gem (1.1.3)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.1)
@@ -414,7 +402,7 @@ DEPENDENCIES
   byebug
   capybara
   capybara-email
-  decent_exposure!
+  decent_exposure
   devise
   dotenv-rails
   faraday
@@ -430,7 +418,7 @@ DEPENDENCIES
   puma (~> 6.0)
   rails (~> 7.0.0)
   rspec-rails
-  rspotify!
+  rspotify
   rubocop
   rubocop-performance
   rubocop-rails