Use packaged version of ruby-gitlab-markup (drop patches)

This commit is contained in:
Pirate Praveen 2022-06-08 22:28:56 +05:30
parent 1dd3a33174
commit 1fadc36945
No known key found for this signature in database
GPG key ID: 8F53E0193B294B75
3 changed files with 1 additions and 15 deletions

1
debian/control vendored
View file

@ -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~),

View file

@ -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'

View file

@ -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