From dec951cec138bc9cfc8e8f9ec16913be3a3429d5 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sat, 2 Feb 2019 14:29:51 +0530 Subject: [PATCH] Relax dependency on ruby-github-markup and ruby-gitaly-proto --- debian/patches/0430-relax-gitaly-proto.patch | 11 +++++++++++ debian/patches/0440-use-github-markup.patch | 11 +++++++++++ debian/patches/series | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 debian/patches/0430-relax-gitaly-proto.patch create mode 100644 debian/patches/0440-use-github-markup.patch diff --git a/debian/patches/0430-relax-gitaly-proto.patch b/debian/patches/0430-relax-gitaly-proto.patch new file mode 100644 index 0000000000..6686727521 --- /dev/null +++ b/debian/patches/0430-relax-gitaly-proto.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -407,7 +407,7 @@ + end + + # Gitaly GRPC client +-gem 'gitaly-proto', '~> 0.113.0', require: 'gitaly' ++gem 'gitaly-proto', '~> 0.113', require: 'gitaly' + gem 'grpc', '~> 1.11' + + # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/debian/patches/0440-use-github-markup.patch b/debian/patches/0440-use-github-markup.patch new file mode 100644 index 0000000000..e645d49235 --- /dev/null +++ b/debian/patches/0440-use-github-markup.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -135,7 +135,7 @@ + # Markdown and HTML processing + gem 'html-pipeline', '~> 2.8' + gem 'deckar01-task_list', '2.0' +-gem 'gitlab-markup', '~> 1.6', '>= 1.6.4' ++gem 'github-markup', '~> 1.6', '>= 1.6.4' + gem 'redcarpet', '~> 3.4' + gem 'commonmarker', '~> 0.17' + gem 'RedCloth', '~> 4.3', '>= 4.3.2' diff --git a/debian/patches/series b/debian/patches/series index 26284775a6..56d6f8bf0b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,6 +9,8 @@ 0400-Relax-recaptcha-version.patch 0410-relax-dropzonejs-rails.patch 0420-relax-rdoc.patch +0430-relax-gitaly-proto.patch +0440-use-github-markup.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch 0520-add-system-lib-path-for-webpack.patch