relax nokogiri

This commit is contained in:
Praveen Arimbrathodiyil 2016-02-05 21:21:42 +05:30
parent 673f0f5a8e
commit d3154a8bbd
2 changed files with 16 additions and 0 deletions

View file

@ -0,0 +1,15 @@
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13218
Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -104,7 +104,7 @@ gem 'rouge', '~> 1.10.1'
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
-gem 'nokogiri', '1.6.7.2'
+gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
# Diffs
gem 'diffy', '~> 3.0.3'

View file

@ -8,6 +8,7 @@
0028-loosen-ace-rails-ap.patch
0037-loosen-request-store.patch
0038-relax-net-ssh.patch
0039-relax-nokogiri.patch
0100-remove-development-test.patch
0102-loosen-octokit.patch
0108-make-mysql-optional.patch