From 4d8567fd50ecdfe120b5676e02d8b2a60a8eda53 Mon Sep 17 00:00:00 2001
From: Praveen Arimbrathodiyil <praveen@debian.org>
Date: Sun, 10 Jul 2016 20:23:52 +0530
Subject: [PATCH] relax rouge, grape

---
 debian/changelog                     |  6 ++++++
 debian/patches/052-relax-grape.patch | 15 +++++++++++++++
 debian/patches/053-relax-rouge.patch | 13 +++++++++++++
 debian/patches/series                |  2 ++
 4 files changed, 36 insertions(+)
 create mode 100644 debian/patches/052-relax-grape.patch
 create mode 100644 debian/patches/053-relax-rouge.patch

diff --git a/debian/changelog b/debian/changelog
index de45a5a36b..6df02da330 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gitlab (8.9.0+dfsg-3) unstable; urgency=medium
+
+  * Relax grape and rouge in Gemfile 
+
+ -- Pirate Praveen <praveen@debian.org>  Sun, 10 Jul 2016 20:23:41 +0530
+
 gitlab (8.9.0+dfsg-2) unstable; urgency=medium
 
   * Reupload to unstable
diff --git a/debian/patches/052-relax-grape.patch b/debian/patches/052-relax-grape.patch
new file mode 100644
index 0000000000..fc13854d79
--- /dev/null
+++ b/debian/patches/052-relax-grape.patch
@@ -0,0 +1,15 @@
+https://gitlab.com/gitlab-org/gitlab-ce/issues/19670
+
+Index: gitlab/Gemfile
+===================================================================
+--- gitlab.orig/Gemfile
++++ gitlab/Gemfile
+@@ -69,7 +69,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.2',
+ gem "github-linguist", "~> 4.7", require: "linguist"
+ 
+ # API
+-gem 'grape',        '~> 0.13.0'
++gem 'grape',        '~> 0.16.0'
+ gem 'grape-entity', '~> 0.5.0'
+ gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
+ 
diff --git a/debian/patches/053-relax-rouge.patch b/debian/patches/053-relax-rouge.patch
new file mode 100644
index 0000000000..8437d49c54
--- /dev/null
+++ b/debian/patches/053-relax-rouge.patch
@@ -0,0 +1,13 @@
+Index: gitlab/Gemfile
+===================================================================
+--- gitlab.orig/Gemfile
++++ gitlab/Gemfile
+@@ -113,7 +113,7 @@ gem 'org-ruby',      '~> 0.9.12'
+ gem 'creole',        '~> 0.5.0'
+ gem 'wikicloth',     '0.8.1'
+ gem 'asciidoctor',   '~> 1.5', '>= 1.5.2'
+-gem 'rouge',         '~> 1.11'
++gem 'rouge',         '~> 2.0', '>= 2.0.2'
+ 
+ # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
+ # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
diff --git a/debian/patches/series b/debian/patches/series
index 9e01c1bfe3..444142d0e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@
 source-init-functions.patch
 pid-log-paths.patch
 0200-use-jquery-for-jquery2.patch
+052-relax-grape.patch
+053-relax-rouge.patch