relax rouge, grape
This commit is contained in:
parent
e62f6d1fb5
commit
4d8567fd50
4 changed files with 36 additions and 0 deletions
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -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
|
||||
|
|
15
debian/patches/052-relax-grape.patch
vendored
Normal file
15
debian/patches/052-relax-grape.patch
vendored
Normal file
|
@ -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'
|
||||
|
13
debian/patches/053-relax-rouge.patch
vendored
Normal file
13
debian/patches/053-relax-rouge.patch
vendored
Normal file
|
@ -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
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue