tag patches
This commit is contained in:
parent
8ec1d3e4f5
commit
56d07ffb16
15 changed files with 28 additions and 14 deletions
|
@ -1,3 +1,5 @@
|
||||||
|
Debian package contains gitlab patches
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
2
debian/patches/0015-loosen-carrierwave.patch
vendored
2
debian/patches/0015-loosen-carrierwave.patch
vendored
|
@ -1,3 +1,5 @@
|
||||||
|
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2805
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
2
debian/patches/0016-loosen-fog.patch
vendored
2
debian/patches/0016-loosen-fog.patch
vendored
|
@ -1,3 +1,5 @@
|
||||||
|
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2807
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
13
debian/patches/0017-loosen-redcarpet.patch
vendored
13
debian/patches/0017-loosen-redcarpet.patch
vendored
|
@ -1,13 +0,0 @@
|
||||||
Index: gitlab/Gemfile
|
|
||||||
===================================================================
|
|
||||||
--- gitlab.orig/Gemfile
|
|
||||||
+++ gitlab/Gemfile
|
|
||||||
@@ -93,7 +93,7 @@ gem "seed-fu", '~> 2.3.5'
|
|
||||||
gem 'html-pipeline', '~> 1.11.0'
|
|
||||||
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
|
|
||||||
gem 'github-markup', '~> 1.3.1'
|
|
||||||
-gem 'redcarpet', '~> 3.3.3'
|
|
||||||
+gem 'redcarpet', '~> 3.3.2'
|
|
||||||
gem 'RedCloth', '~> 4.2.9'
|
|
||||||
gem 'rdoc', '~>3.6'
|
|
||||||
gem 'org-ruby', '~> 0.9.12'
|
|
2
debian/patches/0018-loosen-rdoc.patch
vendored
2
debian/patches/0018-loosen-rdoc.patch
vendored
|
@ -1,3 +1,5 @@
|
||||||
|
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
2
debian/patches/0020-loosen-unicorn.patch
vendored
2
debian/patches/0020-loosen-unicorn.patch
vendored
|
@ -1,3 +1,5 @@
|
||||||
|
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2820
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2857
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
2
debian/patches/003-loosen-sprockets.patch
vendored
2
debian/patches/003-loosen-sprockets.patch
vendored
|
@ -1,3 +1,5 @@
|
||||||
|
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
Bundler will fail when it can't find these locally
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
2
debian/patches/0102-loosen-octokit.patch
vendored
2
debian/patches/0102-loosen-octokit.patch
vendored
|
@ -1,3 +1,5 @@
|
||||||
|
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2877
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
We can remove this patch when we update to 3.0
|
||||||
|
.
|
||||||
|
We were waiting to test diaspora with 3.0
|
||||||
|
|
||||||
Index: gitlab/Gemfile
|
Index: gitlab/Gemfile
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/Gemfile
|
--- gitlab.orig/Gemfile
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
run from PATH
|
||||||
|
|
||||||
Index: gitlab/lib/support/init.d/gitlab
|
Index: gitlab/lib/support/init.d/gitlab
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/lib/support/init.d/gitlab
|
--- gitlab.orig/lib/support/init.d/gitlab
|
||||||
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -4,7 +4,6 @@ loosen-rails-version.patch
|
||||||
0005-use-debian-omniauth-ldap.patch
|
0005-use-debian-omniauth-ldap.patch
|
||||||
0015-loosen-carrierwave.patch
|
0015-loosen-carrierwave.patch
|
||||||
0016-loosen-fog.patch
|
0016-loosen-fog.patch
|
||||||
0017-loosen-redcarpet.patch
|
|
||||||
0018-loosen-rdoc.patch
|
0018-loosen-rdoc.patch
|
||||||
0020-loosen-unicorn.patch
|
0020-loosen-unicorn.patch
|
||||||
0028-loosen-ace-rails-ap.patch
|
0028-loosen-ace-rails-ap.patch
|
||||||
|
|
2
debian/patches/source-init-functions.patch
vendored
2
debian/patches/source-init-functions.patch
vendored
|
@ -1,3 +1,5 @@
|
||||||
|
To fix lintian warning
|
||||||
|
|
||||||
Index: gitlab/lib/support/init.d/gitlab
|
Index: gitlab/lib/support/init.d/gitlab
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gitlab.orig/lib/support/init.d/gitlab
|
--- gitlab.orig/lib/support/init.d/gitlab
|
||||||
|
|
Loading…
Add table
Reference in a new issue