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:
Pirate Praveen 2018-03-27 22:49:57 +05:30
parent ca3485e31f
commit d06650f8e9
15 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -274,7 +274,6 @@ @@ -273,7 +273,6 @@
gem 'rails-i18n', '~> 4.0', '>= 4.0.9' gem 'rails-i18n', '~> 4.0', '>= 4.0.9'
gem 'gettext_i18n_rails', '~> 1.8' gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.2' gem 'gettext_i18n_rails_js', '~> 1.2'
@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
gem 'batch-loader', '~> 1.2', '>= 1.2.1' gem 'batch-loader', '~> 1.2', '>= 1.2.1'
@@ -300,21 +299,6 @@ @@ -299,21 +298,6 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end

4
debian/patches/0110-make-test-dependencies-conditional.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -300,7 +300,7 @@ @@ -299,7 +299,7 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -9,7 +9,7 @@
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.4.1', platform: :mri gem 'pry-byebug', '~> 3.4.1', platform: :mri
gem 'pry-rails', '~> 0.3.4' gem 'pry-rails', '~> 0.3.4'
@@ -353,9 +353,9 @@ @@ -352,9 +352,9 @@
gem 'stackprof', '~> 0.2.10', require: false gem 'stackprof', '~> 0.2.10', require: false
gem 'simple_po_parser', '~> 1.1.2', require: false gem 'simple_po_parser', '~> 1.1.2', require: false

2
debian/patches/0220-relax-webmock.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -359,7 +359,7 @@ @@ -358,7 +358,7 @@
gem 'shoulda-matchers', '~> 3.1.2', require: false gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 1.6.0' gem 'email_spec', '~> 1.6.0'
gem 'json-schema', '~> 2.8.0' gem 'json-schema', '~> 2.8.0'

2
debian/patches/0250-relax-licensee.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -223,7 +223,7 @@ @@ -222,7 +222,7 @@
gem 'loofah', '~> 2.0', '>= 2.0.3' gem 'loofah', '~> 2.0', '>= 2.0.3'
# Working with license # Working with license

2
debian/patches/0290-skip-peek-mysql2.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -282,7 +282,7 @@ @@ -281,7 +281,7 @@
gem 'peek', '~> 1.0', '>= 1.0.1' gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2' gem 'peek-gc', '~> 0.0.2'
gem 'peek-host', '~> 1.0' gem 'peek-host', '~> 1.0'

2
debian/patches/0300-relax-rbnacl.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -393,7 +393,7 @@ @@ -392,7 +392,7 @@
# Required for ED25519 SSH host key support # Required for ED25519 SSH host key support
group :ed25519 do group :ed25519 do
gem 'rbnacl-libsodium' gem 'rbnacl-libsodium'

2
debian/patches/0330-relax-acts-as-taggable-on.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -154,7 +154,7 @@ @@ -153,7 +153,7 @@
gem 'state_machines-activerecord', '~> 0.4.0' gem 'state_machines-activerecord', '~> 0.4.0'
# Issue tags # Issue tags

2
debian/patches/0340-relax-httparty.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -166,7 +166,7 @@ @@ -165,7 +165,7 @@
gem 'rufus-scheduler', '~> 3.4' gem 'rufus-scheduler', '~> 3.4'
# HTTP requests # HTTP requests

2
debian/patches/0350-relax-oj.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -238,7 +238,7 @@ @@ -237,7 +237,7 @@
gem 'charlock_holmes', '~> 0.7.5' gem 'charlock_holmes', '~> 0.7.5'
# Faster JSON # Faster JSON

2
debian/patches/0370-relax-prof.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -374,7 +374,7 @@ @@ -373,7 +373,7 @@
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'

2
debian/patches/0390-relax-gitaly-proto.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -398,7 +398,7 @@ @@ -397,7 +397,7 @@
end end
# Gitaly GRPC client # Gitaly GRPC client

2
debian/patches/0391-relax-google-protobuf.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -402,7 +402,7 @@ @@ -401,7 +401,7 @@
gem 'grpc', '~> 1.10.0' gem 'grpc', '~> 1.10.0'
# Locked until https://github.com/google/protobuf/issues/4210 is closed # Locked until https://github.com/google/protobuf/issues/4210 is closed

2
debian/patches/0392-relax-flipper.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -407,9 +407,9 @@ @@ -406,9 +406,9 @@
gem 'toml-rb', '~> 1.0', require: false gem 'toml-rb', '~> 1.0', require: false
# Feature toggles # Feature toggles

2
debian/patches/0393-relax-kubeclient.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -210,7 +210,7 @@ @@ -209,7 +209,7 @@
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration # Kubernetes integration

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

@ -1,10 +1,8 @@
Description: fix lintian warning and init script error Description: fix lintian warning and init script error
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/12954 Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/12954
Index: gitlab/lib/support/init.d/gitlab --- a/lib/support/init.d/gitlab
=================================================================== +++ b/lib/support/init.d/gitlab
--- gitlab.orig/lib/support/init.d/gitlab
+++ gitlab/lib/support/init.d/gitlab
@@ -23,6 +23,9 @@ @@ -23,6 +23,9 @@
# An example defaults file can be found in lib/support/init.d/gitlab.default.example # An example defaults file can be found in lib/support/init.d/gitlab.default.example
### ###
@ -15,7 +13,7 @@ Index: gitlab/lib/support/init.d/gitlab
### Environment variables ### Environment variables
RAILS_ENV="production" RAILS_ENV="production"
@@ -38,7 +41,7 @@ web_server_pid_path="$pid_path/unicorn.p @@ -38,7 +41,7 @@
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"