diff --git a/debian/control b/debian/control index b21bae6508..48e26c2e1d 100644 --- a/debian/control +++ b/debian/control @@ -73,7 +73,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, # Debian package includes gitlab patches ruby-omniauth-ldap (>= 1.0.4~), # Git Wiki - ruby-gollum-lib (>= 4.1.0~), + ruby-gollum-lib (>= 4.2~), # Language detection ruby-github-linguist (>= 4.7.0~), # API diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index e280ec9b30..ff4d9370fb 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -5,6 +5,15 @@ Index: gitlab/Gemfile =================================================================== --- gitlab.orig/Gemfile +++ gitlab/Gemfile +@@ -61,7 +61,7 @@ gem 'omniauth-ldap', '~> 1.0.4', require + + # Git Wiki + # Required manually in config/initializers/gollum.rb to control load order +-gem 'gollum-lib', '~> 4.1.0', require: false ++gem 'gollum-lib', '~> 4.2', require: false + gem 'gollum-rugged_adapter', '~> 0.4.2', require: false + + # Language detection @@ -97,7 +97,7 @@ gem "seed-fu", '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' diff --git a/debian/patches/0106-loosen-gollum-lib.patch b/debian/patches/0106-loosen-gollum-lib.patch deleted file mode 100644 index 8d16bff74e..0000000000 --- a/debian/patches/0106-loosen-gollum-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gitlab/Gemfile -=================================================================== ---- gitlab.orig/Gemfile -+++ gitlab/Gemfile -@@ -48,7 +48,7 @@ gem "gitlab_git", '~> 7.2.20' - gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap" - - # Git Wiki --gem 'gollum-lib', '~> 4.0.2' -+gem 'gollum-lib', '~> 4.1.0' - - # Language detection - gem "github-linguist", "~> 4.7.0", require: "linguist"