realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refresh patches

Browse source
This commit is contained in:
Praveen Arimbrathodiyil 2016-04-02 18:29:19 +05:30
parent d431465499
commit 5e81b74803
18 changed files with 33 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/patches/0002-loosen-devise.patch vendored
View file

@ -12,4 +12,4 @@ Index: gitlab/Gemfile
+gem 'devise', '~> 3.5.2' +gem 'devise', '~> 3.5.2'
gem 'devise-async', '~> 0.9.0' gem 'devise-async', '~> 0.9.0'
gem 'doorkeeper', '~> 2.2.0' gem 'doorkeeper', '~> 2.2.0'
gem 'omniauth', '~> 1.2.2' gem 'omniauth', '~> 1.3.1'

2
debian/patches/0005-use-debian-omniauth-ldap.patch vendored
View file

@ -5,7 +5,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -54,7 +54,7 @@ gem "gitlab_git", '~> 7.2.22' @@ -55,7 +55,7 @@ gem "gitlab_git", '~> 8.2'
# LDAP Auth # LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes # GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master

2
debian/patches/0015-loosen-carrierwave.patch vendored
View file

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -74,7 +74,7 @@ gem "kaminari", "~> 0.16.3" @@ -75,7 +75,7 @@ gem "kaminari", "~> 0.16.3"
gem "haml-rails", '~> 0.9.0' gem "haml-rails", '~> 0.9.0'
# Files attachments # Files attachments

2
debian/patches/0016-loosen-fog.patch vendored
View file

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -80,7 +80,7 @@ gem "carrierwave", '~> 0.10.0' @@ -81,7 +81,7 @@ gem "carrierwave", '~> 0.10.0'
gem 'dropzonejs-rails', '~> 0.7.1' gem 'dropzonejs-rails', '~> 0.7.1'
# for aws storage # for aws storage

2
debian/patches/0018-loosen-rdoc.patch vendored
View file

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -95,7 +95,7 @@ gem 'task_list', '~> 1.0.2', require @@ -96,7 +96,7 @@ gem 'task_list', '~> 1.0.2', require
gem 'github-markup', '~> 1.3.1' gem 'github-markup', '~> 1.3.1'
gem 'redcarpet', '~> 3.3.3' gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.2.9' gem 'RedCloth', '~> 4.2.9'

2
debian/patches/0020-loosen-unicorn.patch vendored
View file

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -111,7 +111,7 @@ gem 'diffy', '~> 3.0.3' @@ -112,7 +112,7 @@ gem 'diffy', '~> 3.0.3'
# Application server # Application server
group :unicorn do group :unicorn do

2
debian/patches/0028-loosen-ace-rails-ap.patch vendored
View file

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -183,7 +183,7 @@ gem 'babosa', '~> 1.0.2' @@ -187,7 +187,7 @@ gem "loofah", "~> 2.0.3"
gem "rack-attack", '~> 4.3.1' gem "rack-attack", '~> 4.3.1'
# Ace editor # Ace editor

2
debian/patches/0037-loosen-request-store.patch vendored
View file

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -208,7 +208,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3' @@ -212,7 +212,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
gem 'jquery-ui-rails', '~> 5.0.0' gem 'jquery-ui-rails', '~> 5.0.0'
gem 'nprogress-rails', '~> 0.1.6.7' gem 'nprogress-rails', '~> 0.1.6.7'
gem 'raphael-rails', '~> 2.1.2' gem 'raphael-rails', '~> 2.1.2'

12
debian/patches/0038-relax-net-ssh.patch vendored
View file

@ -2,14 +2,16 @@ Description: Relax requirement on net-ssh
Author: Pirate Praveen <praveen@debian.org> Author: Pirate Praveen <praveen@debian.org>
--- ---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Gemfile Index: gitlab/Gemfile
+++ b/Gemfile ===================================================================
@@ -211,7 +211,7 @@ --- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -215,7 +215,7 @@ gem 'raphael-rails', '~> 2.1.2'
gem 'request_store', '~> 1.1' gem 'request_store', '~> 1.1'
gem 'select2-rails', '~> 3.5.9' gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1' gem 'virtus', '~> 1.0.1'
-gem 'net-ssh', '~> 3.0.1' -gem 'net-ssh', '~> 3.0.1'
+gem 'net-ssh', '>= 2.9.2' +gem 'net-ssh', '>= 2.9.2'
# Metrics # Sentry integration
group :metrics do gem 'sentry-raven', '~> 0.15'

15
debian/patches/0039-relax-nokogiri.patch vendored
View file

@ -1,15 +0,0 @@
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.1'
# Diffs
gem 'diffy', '~> 3.0.3'

4
debian/patches/0040-relax-rails.patch vendored
View file

@ -5,8 +5,8 @@ Index: gitlab/Gemfile
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
source "https://rubygems.org" source "https://rubygems.org"
-gem 'rails', '4.2.5.1' -gem 'rails', '4.2.5.2'
+gem 'rails', '~> 4.2.5', '>= 4.2.5.1' +gem 'rails', '~> 4.2.5', '>= 4.2.5.2'
gem 'rails-deprecated_sanitizer', '~> 1.0.3' gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with # Responders respond_to and respond_with

4
debian/patches/0041-relax-omniauth.patch vendored
View file

@ -6,8 +6,8 @@ Index: gitlab/Gemfile
gem 'devise', '~> 3.5.2' gem 'devise', '~> 3.5.2'
gem 'devise-async', '~> 0.9.0' gem 'devise-async', '~> 0.9.0'
gem 'doorkeeper', '~> 2.2.0' gem 'doorkeeper', '~> 2.2.0'
-gem 'omniauth', '~> 1.2.2' -gem 'omniauth', '~> 1.3.1'
+gem 'omniauth', '~> 1.2', '>= 1.2.2' +gem 'omniauth', '~> 1.3', '>= 1.3.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6' gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-bitbucket', '~> 0.0.2'
gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-cas3', '~> 1.1.2'

2
debian/patches/0042-relax-grape-entity.patch vendored
View file

@ -2,7 +2,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -64,7 +64,7 @@ gem "github-linguist", "~> 4.7.0", requi @@ -65,7 +65,7 @@ gem "github-linguist", "~> 4.7.0", requi
# API # API
gem 'grape', '~> 0.13.0' gem 'grape', '~> 0.13.0'

6
debian/patches/0050-relax-stable-libs.patch vendored
View file

@ -6,12 +6,12 @@ Index: gitlab/Gemfile
gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-gitlab', '~> 1.0.0'
gem 'omniauth-google-oauth2', '~> 0.2.0' gem 'omniauth-google-oauth2', '~> 0.2.0'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
-gem 'omniauth-saml', '~> 1.4.0' -gem 'omniauth-saml', '~> 1.4.2'
+gem 'omniauth-saml', '~> 1.4' +gem 'omniauth-saml', '~> 1.4', '>= 1.4.2'
gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-shibboleth', '~> 1.2.0'
gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0'
gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth_crowd', '~> 2.2.0'
@@ -92,7 +92,7 @@ gem "seed-fu", '~> 2.3.5' @@ -93,7 +93,7 @@ gem "seed-fu", '~> 2.3.5'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0' gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'

14
debian/patches/0100-remove-development-test.patch vendored
View file

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -221,87 +221,11 @@ group :metrics do @@ -228,83 +228,6 @@ group :metrics do
gem 'connection_pool', '~> 2.0', require: false gem 'connection_pool', '~> 2.0', require: false
end end
@ -79,16 +79,12 @@ Index: gitlab/Gemfile
- gem 'sham_rack' - gem 'sham_rack'
-end -end
- -
group :production do -group :production do
- gem "gitlab_meta", '7.0' - gem "gitlab_meta", '7.0'
-end
- -
# Sentry integration -gem "newrelic_rpm", '~> 3.14'
gem 'sentry-raven'
end
-gem "newrelic_rpm", '~> 3.9.4.245'
-gem 'newrelic-grape'
- -
gem 'octokit', '~> 3.7.0' gem 'octokit', '~> 3.8.0'
gem "mail_room", "~> 0.6.1" gem "mail_room", "~> 0.6.1"

8
debian/patches/0102-loosen-octokit.patch vendored
View file

@ -4,12 +4,12 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -226,7 +226,7 @@ group :production do @@ -228,7 +228,7 @@ group :metrics do
gem 'sentry-raven' gem 'connection_pool', '~> 2.0', require: false
end end
-gem 'octokit', '~> 3.7.0' -gem 'octokit', '~> 3.8.0'
+gem 'octokit', '~> 3.7' +gem 'octokit', '~> 3.8'
gem "mail_room", "~> 0.6.1" gem "mail_room", "~> 0.6.1"

1
debian/patches/series vendored
View file

@ -8,7 +8,6 @@
0028-loosen-ace-rails-ap.patch 0028-loosen-ace-rails-ap.patch
0037-loosen-request-store.patch 0037-loosen-request-store.patch
0038-relax-net-ssh.patch 0038-relax-net-ssh.patch
0039-relax-nokogiri.patch
0040-relax-rails.patch 0040-relax-rails.patch
0041-relax-omniauth.patch 0041-relax-omniauth.patch
0042-relax-grape-entity.patch 0042-relax-grape-entity.patch

2
debian/patches/source-init-functions.patch vendored
View file

@ -19,7 +19,7 @@ Index: gitlab/lib/support/init.d/gitlab
sidekiq_pid_path="$pid_path/sidekiq.pid" sidekiq_pid_path="$pid_path/sidekiq.pid"
mail_room_enabled=false mail_room_enabled=false
mail_room_pid_path="$pid_path/mail_room.pid" mail_room_pid_path="$pid_path/mail_room.pid"
-gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd) -gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse 2> /dev/null && pwd)
+gitlab_workhorse_dir=$app_root/../gitlab-workhorse +gitlab_workhorse_dir=$app_root/../gitlab-workhorse
gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid" gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket $rails_socket -documentRoot $app_root/public" gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket $rails_socket -documentRoot $app_root/public"