From a7e1b64b955fc94378d667420d7944f5e43dde5b Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Thu, 1 Jul 2021 15:21:03 +0200
Subject: [PATCH] Maintenance: Unpin twitter gem.

---
 Gemfile      |  2 +-
 Gemfile.lock | 32 ++++++++++++--------------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index c22901426..2e207bbb3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,7 +96,7 @@ gem 'gmail_xoauth'
 gem 'koala'
 gem 'telegramAPI'
 # Updating twitter to 'master' seems to break things, so freeze the revision for now.
-gem 'twitter', git: 'https://github.com/sferik/twitter.git', ref: '29a18644e3c433f53ed76f0867f9b9734f7a7357'
+gem 'twitter'
 
 # channels - email additions
 gem 'htmlentities'
diff --git a/Gemfile.lock b/Gemfile.lock
index 60eb946da..675b4080e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,20 +1,3 @@
-GIT
-  remote: https://github.com/sferik/twitter.git
-  revision: 29a18644e3c433f53ed76f0867f9b9734f7a7357
-  ref: 29a18644e3c433f53ed76f0867f9b9734f7a7357
-  specs:
-    twitter (7.0.0)
-      addressable (~> 2.3)
-      buftok (~> 0.2.0)
-      equalizer (~> 0.0.11)
-      http (~> 4.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
-      memoizable (~> 0.4.0)
-      multipart-post (~> 2.0)
-      naught (~> 1.0)
-      simple_oauth (~> 0.3.0)
-
 GIT
   remote: https://github.com/wimm/rubyntlm
   revision: 53969639b87b9e5d5fef560f19cf0d977259591c
@@ -309,7 +292,6 @@ GEM
     ice_cube (0.16.3)
     inflection (1.0.0)
     interception (0.5)
-    ipaddr (1.2.2)
     json (2.5.1)
     jwt (2.2.3)
     kgio (2.11.4)
@@ -409,7 +391,6 @@ GEM
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0)
     openssl (2.2.0)
-      ipaddr
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
@@ -603,6 +584,17 @@ GEM
       faraday (>= 0.9, < 2.0)
       jwt (>= 1.5, <= 2.5)
       nokogiri (>= 1.6, < 2.0)
+    twitter (7.0.0)
+      addressable (~> 2.3)
+      buftok (~> 0.2.0)
+      equalizer (~> 0.0.11)
+      http (~> 4.0)
+      http-form_data (~> 2.0)
+      http_parser.rb (~> 0.6.0)
+      memoizable (~> 0.4.0)
+      multipart-post (~> 2.0)
+      naught (~> 1.0)
+      simple_oauth (~> 0.3.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
@@ -745,7 +737,7 @@ DEPENDENCIES
   telephone_number
   test-unit
   twilio-ruby
-  twitter!
+  twitter
   uglifier
   unicorn
   valid_email2