refresh patches
This commit is contained in:
parent
9eb83cdaec
commit
673f0f5a8e
9 changed files with 7 additions and 21 deletions
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -1,6 +1,7 @@
|
|||
gitlab (8.4.3+dfsg-1) UNRELEASED; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
* Refresh patches (rails version is in sync)
|
||||
|
||||
-- Pirate Praveen <praveen@debian.org> Fri, 05 Feb 2016 20:31:30 +0530
|
||||
|
||||
|
|
2
debian/patches/0020-loosen-unicorn.patch
vendored
2
debian/patches/0020-loosen-unicorn.patch
vendored
|
@ -4,7 +4,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -110,7 +110,7 @@ gem 'diffy', '~> 3.0.3'
|
||||
@@ -111,7 +111,7 @@ gem 'diffy', '~> 3.0.3'
|
||||
|
||||
# Application server
|
||||
group :unicorn do
|
||||
|
|
|
@ -4,7 +4,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -182,7 +182,7 @@ gem 'babosa', '~> 1.0.2'
|
||||
@@ -183,7 +183,7 @@ gem 'babosa', '~> 1.0.2'
|
||||
gem "rack-attack", '~> 4.3.1'
|
||||
|
||||
# Ace editor
|
||||
|
|
|
@ -4,7 +4,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -207,7 +207,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
|
||||
@@ -208,7 +208,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
|
||||
gem 'jquery-ui-rails', '~> 5.0.0'
|
||||
gem 'nprogress-rails', '~> 0.1.6.7'
|
||||
gem 'raphael-rails', '~> 2.1.2'
|
||||
|
|
2
debian/patches/0038-relax-net-ssh.patch
vendored
2
debian/patches/0038-relax-net-ssh.patch
vendored
|
@ -2,7 +2,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -210,7 +210,7 @@ gem 'raphael-rails', '~> 2.1.2'
|
||||
@@ -211,7 +211,7 @@ gem 'raphael-rails', '~> 2.1.2'
|
||||
gem 'request_store', '~> 1.1'
|
||||
gem 'select2-rails', '~> 3.5.9'
|
||||
gem 'virtus', '~> 1.0.1'
|
||||
|
|
|
@ -4,7 +4,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -220,87 +220,11 @@ group :metrics do
|
||||
@@ -221,87 +221,11 @@ group :metrics do
|
||||
gem 'connection_pool', '~> 2.0', require: false
|
||||
end
|
||||
|
||||
|
|
2
debian/patches/0102-loosen-octokit.patch
vendored
2
debian/patches/0102-loosen-octokit.patch
vendored
|
@ -4,7 +4,7 @@ Index: gitlab/Gemfile
|
|||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -225,7 +225,7 @@ group :production do
|
||||
@@ -226,7 +226,7 @@ group :production do
|
||||
gem 'sentry-raven'
|
||||
end
|
||||
|
||||
|
|
14
debian/patches/loosen-rails-version.patch
vendored
14
debian/patches/loosen-rails-version.patch
vendored
|
@ -1,14 +0,0 @@
|
|||
Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/issues/2694
|
||||
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -1,6 +1,6 @@
|
||||
source "https://rubygems.org"
|
||||
|
||||
-gem 'rails', '4.2.4'
|
||||
+gem 'rails', '~> 4.2.4'
|
||||
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
||||
|
||||
# Responders respond_to and respond_with
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -1,4 +1,3 @@
|
|||
loosen-rails-version.patch
|
||||
0002-loosen-devise.patch
|
||||
003-loosen-sprockets.patch
|
||||
0005-use-debian-omniauth-ldap.patch
|
||||
|
|
Loading…
Reference in a new issue