From 82b2ef464e4c94be81204adff9c568c7b679bde0 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 1 Apr 2021 17:46:58 +0530
Subject: [PATCH] Drop ruby-hipchat dependency and refresh patch for the same
 change in Gemfile

---
 debian/control                              | 2 --
 debian/patches/0050-relax-stable-libs.patch | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index c688768c82..3e2ee5f620 100644
--- a/debian/control
+++ b/debian/control
@@ -212,8 +212,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
    ruby-redis-actionpack (>= 5.2~),
 # Discord integration
  ruby-discordrb-webhooks (>= 3.3~),
-# HipChat integration
- ruby-hipchat (>= 1.5~),
 # JIRA integration
  ruby-jira (>= 2.1.4~),
 # Flowdock integration
diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index e3c94a5d90..b83624f087 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -254,7 +254,7 @@ gitlab Gemfile
  
  # Export Ruby Regex to Javascript
  gem 'js_regex', '~> 3.4'
-@@ -230,23 +230,23 @@
+@@ -230,20 +230,20 @@
  gem 'connection_pool', '~> 2.0'
  
  # Redis session store
@@ -264,10 +264,6 @@ gitlab Gemfile
  # Discord integration
  gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
  
- # HipChat integration
--gem 'hipchat', '~> 1.5.0'
-+gem 'hipchat', '~> 1.5'
- 
  # Jira integration
 -gem 'jira-ruby', '~> 2.1.4'
 +gem 'jira-ruby', '~> 2.1', '>= 2.1.4'
@@ -282,7 +278,7 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5'
-@@ -258,11 +258,11 @@
+@@ -255,11 +255,11 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration