From 1fadc3694550981ebb5e8aa1a74732415eb1bf9b Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 8 Jun 2022 22:28:56 +0530
Subject: [PATCH] Use packaged version of ruby-gitlab-markup (drop patches)

---
 debian/control                                     |  1 +
 .../Gemfile/0060-remove-gitlab-markup.patch        | 14 --------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 debian/patches/Gemfile/0060-remove-gitlab-markup.patch

diff --git a/debian/control b/debian/control
index c6f7b14860..8f7fd4a6e9 100644
--- a/debian/control
+++ b/debian/control
@@ -207,6 +207,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 # Markdown and HTML processing
  ruby-html-pipeline (>= 2.13.2~),
  ruby-task-list (>= 2.3.1~),
+ ruby-gitlab-markup,
  ruby-github-markup (>= 1.7~),
  ruby-commonmarker (>= 0.23.4~),
  ruby-kramdown (>= 2.3.1~),
diff --git a/debian/patches/Gemfile/0060-remove-gitlab-markup.patch b/debian/patches/Gemfile/0060-remove-gitlab-markup.patch
deleted file mode 100644
index 9a0b8e639a..0000000000
--- a/debian/patches/Gemfile/0060-remove-gitlab-markup.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-gitlab-markup and github-markup are almost same except for some uncommon extra
-features in gitlab-markup. Support only github-markup syntax to avoid
-maintaining two almost same packages.
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -152,7 +152,6 @@
- # Markdown and HTML processing
- gem 'html-pipeline', '~> 2.13','>= 2.13.2'
- gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
--gem 'gitlab-markup', '~> 1.8'
- gem 'github-markup', '~> 1.7', require: 'github/markup'
- gem 'commonmarker', '~> 0.23.4'
- gem 'kramdown', '~> 2.3','>= 2.3.1'
diff --git a/debian/patches/series b/debian/patches/series
index ce11a54bfa..b2bdce3821 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ Gemfile/0020-remove-development-test.patch
 Gemfile/0030-make-test-dependencies-conditional.patch
 Gemfile/0040-relax-httparty.patch
 Gemfile/0050-relax-rdoc.patch
-Gemfile/0060-remove-gitlab-markup.patch
 Gemfile/0070-embed-elasticsearch-model.patch
 Gemfile/0080-embed-elasticsearch-rails.patch
 Gemfile/0090-remove-ee-only-gems.patch