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 2019-02-02 18:11:47 +05:30
parent dfa5a6292b
commit 3eb1e8399f
11 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ gitlab Gemfile
# Default values for AR models # Default values for AR models
gem 'default_value_for', gem_versions['default_value_for'] gem 'default_value_for', gem_versions['default_value_for']
@@ -37,35 +37,35 @@ @@ -37,36 +37,36 @@
gem 'doorkeeper', '~> 4.3' gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.5' gem 'doorkeeper-openid_connect', '~> 1.5'
gem 'omniauth', '~> 1.8' gem 'omniauth', '~> 1.8'
@ -70,11 +70,13 @@ gitlab Gemfile
# GitLab Pages # GitLab Pages
-gem 'validates_hostname', '~> 1.0.6' -gem 'validates_hostname', '~> 1.0.6'
-gem 'rubyzip', '~> 1.2.2', require: 'zip'
+gem 'validates_hostname', '~> 1.0', '>= 1.0.6' +gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
+gem 'rubyzip', '~> 1.2', '>= 1.2.2', require: 'zip'
# Browser detection # Browser detection
gem 'browser', '~> 2.5' gem 'browser', '~> 2.5'
@@ -76,17 +76,17 @@ @@ -77,17 +77,17 @@
# 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
@ -96,7 +98,7 @@ gitlab Gemfile
# Disable strong_params so that Mash does not respond to :permitted? # Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes' gem 'hashie-forbidden_attributes'
@@ -95,7 +95,7 @@ @@ -96,7 +96,7 @@
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
@ -105,7 +107,7 @@ gitlab Gemfile
# Files attachments # Files attachments
# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. # Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged.
@@ -104,9 +104,9 @@ @@ -105,9 +105,9 @@
gem 'mini_magick' gem 'mini_magick'
# for backups # for backups
@ -117,7 +119,7 @@ gitlab Gemfile
gem 'fog-local', '~> 0.3' gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1' gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1' gem 'fog-rackspace', '~> 0.1.1'
@@ -119,37 +119,37 @@ @@ -120,37 +120,37 @@
gem 'unf', '~> 0.1.4' gem 'unf', '~> 0.1.4'
# Seed data # Seed data
@ -165,7 +167,7 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4' gem 'unicorn-worker-killer', '~> 0.4.4'
end end
@@ -165,9 +165,9 @@ @@ -166,9 +166,9 @@
gem 'acts-as-taggable-on', '~> 5.0' gem 'acts-as-taggable-on', '~> 5.0'
# Background jobs # Background jobs
@ -177,7 +179,7 @@ gitlab Gemfile
# Cron Parser # Cron Parser
gem 'rufus-scheduler', '~> 3.4' gem 'rufus-scheduler', '~> 3.4'
@@ -182,14 +182,14 @@ @@ -183,14 +183,14 @@
gem 'ruby-progressbar' gem 'ruby-progressbar'
# GitLab settings # GitLab settings
@ -195,7 +197,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript
gem 'js_regex', '~> 2.2.1' gem 'js_regex', '~> 2.2.1'
@@ -198,14 +198,14 @@ @@ -199,14 +199,14 @@
gem 'device_detector' gem 'device_detector'
# Cache # Cache
@ -212,7 +214,7 @@ gitlab Gemfile
# JIRA integration # JIRA integration
gem 'jira-ruby', '~> 1.4' gem 'jira-ruby', '~> 1.4'
@@ -214,7 +214,7 @@ @@ -215,7 +215,7 @@
gem 'flowdock', '~> 0.7' gem 'flowdock', '~> 0.7'
# Slack integration # Slack integration
@ -221,7 +223,7 @@ gitlab Gemfile
# Hangouts Chat integration # Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5' gem 'hangouts-chat', '~> 0.0.5'
@@ -226,11 +226,11 @@ @@ -227,11 +227,11 @@
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration # Kubernetes integration
@ -235,7 +237,7 @@ gitlab Gemfile
# Sanitizes SVG input # Sanitizes SVG input
gem 'loofah', '~> 2.2' gem 'loofah', '~> 2.2'
@@ -239,10 +239,10 @@ @@ -240,10 +240,10 @@
gem 'licensee', '~> 8.9' gem 'licensee', '~> 8.9'
# Protect against bruteforcing # Protect against bruteforcing
@ -248,7 +250,7 @@ gitlab Gemfile
# Detect and convert string character encoding # Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5' gem 'charlock_holmes', '~> 0.7.5'
@@ -257,40 +257,40 @@ @@ -258,40 +258,40 @@
gem 'webpack-rails', '~> 0.9.10' gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
@ -302,7 +304,7 @@ gitlab Gemfile
gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'
# Metrics # Metrics
@@ -399,15 +399,15 @@ @@ -400,15 +400,15 @@
gem 'oauth2', '~> 1.4' gem 'oauth2', '~> 1.4'
# Health check # Health check
@ -322,7 +324,7 @@ gitlab Gemfile
# Required for ED25519 SSH host key support # Required for ED25519 SSH host key support
group :ed25519 do group :ed25519 do
@@ -416,12 +416,12 @@ @@ -417,12 +417,12 @@
end end
# Gitaly GRPC client # Gitaly GRPC client

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
@@ -280,7 +280,6 @@ @@ -281,7 +281,6 @@
gem 'rails-i18n', gem_versions['rails-i18n'] gem 'rails-i18n', gem_versions['rails-i18n']
gem 'gettext_i18n_rails', '~> 1.8' gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext_i18n_rails_js', '~> 1.3'
@ -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'
@@ -303,21 +302,6 @@ @@ -304,21 +303,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
@@ -303,7 +303,7 @@ @@ -304,7 +304,7 @@
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
@ -9,7 +9,7 @@
gem 'bootsnap', '~> 1.3' gem 'bootsnap', '~> 1.3'
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
@@ -355,9 +355,9 @@ @@ -356,9 +356,9 @@
gem 'simple_po_parser', '~> 1.1.2', require: false gem 'simple_po_parser', '~> 1.1.2', require: false
gem 'timecop', '~> 0.8.0' gem 'timecop', '~> 0.8.0'

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

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

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

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -287,7 +287,6 @@ @@ -288,7 +288,6 @@
# Perf bar # Perf bar
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'

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

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

2
debian/patches/0420-relax-js-regex.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -193,7 +193,7 @@ @@ -194,7 +194,7 @@
gem 'version_sorter', '~> 2.1' gem 'version_sorter', '~> 2.1'
# Export Ruby Regex to Javascript # Export Ruby Regex to Javascript

2
debian/patches/0430-remove-gitlab-markup.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -125,7 +125,6 @@ @@ -126,7 +126,6 @@
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 2.8' gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0' gem 'deckar01-task_list', '2.0'

2
debian/patches/0440-remove-puma.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -153,11 +153,6 @@ @@ -154,11 +154,6 @@
gem 'unicorn-worker-killer', '~> 0.4.4' gem 'unicorn-worker-killer', '~> 0.4.4'
end end

2
debian/patches/0450-remove-bullet.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -298,7 +298,6 @@ @@ -299,7 +299,6 @@
if ENV["INCLUDE_TEST_DEPENDS"] == "true" if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bootsnap', '~> 1.3' gem 'bootsnap', '~> 1.3'

2
debian/patches/0460-relax-rspec-rails.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -306,7 +306,7 @@ @@ -307,7 +307,7 @@
gem 'database_cleaner', '~> 1.5.0' gem 'database_cleaner', '~> 1.5.0'
gem 'factory_bot_rails', '~> 4.8.2' gem 'factory_bot_rails', '~> 4.8.2'