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

Update 0050-relax-stable-libs.patch

Browse source
This commit is contained in:
Utkarsh Gupta 2019-05-18 00:59:38 +05:30
parent 75cb152793
commit b960044a5b
1 changed files with 47 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,13 +45,13 @@ gitlab Gemfile
-gem 'omniauth_crowd', '~> 2.2.0'
+gem 'omniauth_crowd', '~> 2.2'
gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'rack-oauth2', '~> 1.2.1'
-gem 'rack-oauth2', '~> 1.9.3'
-gem 'jwt', '~> 2.1.0'
+gem 'rack-oauth2', '~> 1.2', '>= 1.2.1'
+gem 'rack-oauth2', '~> 1.9', '>= 1.9.3'
+gem 'jwt', '~> 2.1'
# Spam and anti-bot protection
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 2.0'
# Two-factor authentication
@ -78,8 +78,8 @@ gitlab Gemfile
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.0', '>= 2.0.4', require: 'omniauth-ldap'
-gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
+gem 'gitlab_omniauth-ldap', '~> 2.1', '>= 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap'
# API
@ -97,7 +97,7 @@ gitlab Gemfile
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -87,16 +87,16 @@ gem 'hashie-forbidden_attributes'
@@ -87,7 +87,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0'
# HAML
@ -106,18 +106,16 @@ gitlab Gemfile
# Files attachments
gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups
-gem 'fog-aws', '~> 2.0.1'
+gem 'fog-aws', '~> 2.0', '>= 2.0.1'
gem 'fog-core', '~> 1.44'
-gem 'fog-google', '~> 1.7.1'
+gem 'fog-google', '~> 1.7', '>= 1.7.1'
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
@@ -109,32 +109,32 @@ gem 'google-api-client', '~> 0.23'
@@ -97,7 +97,7 @@ gem 'mini_magick'
gem 'fog-aws', '~> 3.3'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
-gem 'fog-core', '= 2.1.0'
+gem 'fog-core', '= 2.1'
gem 'fog-google', '~> 1.8'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
@@ -111,38 +111,38 @@ gem 'google-api-client', '~> 0.23'
gem 'unf', '~> 0.1.4'
# Seed data
@ -127,10 +125,10 @@ gitlab Gemfile
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.2.0'
-gem 'gitlab-markup', '~> 1.6.5'
-gem 'gitlab-markup', '~> 1.7.0'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'deckar01-task_list', '2.0'
+gem 'gitlab-markup', '~> 1.6', '>= 1.6.5'
+gem 'deckar01-task_list', '~> 2.2'
+gem 'gitlab-markup', '~> 1.7'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
-gem 'RedCloth', '~> 4.3.2'
@ -144,9 +142,9 @@ gitlab Gemfile
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 2.7.0'
-gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.1'
+gem 'bootstrap_form', '~> 2.7'
+gem 'bootstrap_form', '~> 4.2'
+gem 'nokogiri', '~> 1.10', '>= 1.10.1'
gem 'escape_utils', '~> 1.1'
@ -158,18 +156,16 @@ gitlab Gemfile
+gem 'diffy', '~> 3.1'
# Application server
# The 2.0.6 version of rack requires monkeypatch to be present in
@@ -143,7 +143,7 @@ gem 'diffy', '~> 3.1.0'
gem 'rack', '2.0.6'
gem 'rack', '~> 2.0.7'
group :unicorn do
- gem 'unicorn', '~> 5.1.0'
+ gem 'unicorn', '~> 5.1'
- gem 'unicorn', '~> 5.4.1'
+ gem 'unicorn', '~> 5.4', '>= 5.4.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -159,9 +159,9 @@ gem 'state_machines-activerecord', '~> 0.5.1'
gem 'acts-as-taggable-on', '~> 5.0'
@@ -158,9 +158,9 @@ gem 'state_machines-activerecord', '~> 0.5.1'
gem 'acts-as-taggable-on', '~> 6.0'
# Background jobs
-gem 'sidekiq', '~> 5.2.1'
@ -180,7 +176,7 @@ gitlab Gemfile
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
@@ -177,14 +177,14 @@ gem 'rainbow', '~> 3.0'
@@ -176,14 +176,14 @@ gem 'rainbow', '~> 3.0'
gem 'ruby-progressbar'
# GitLab settings
@ -193,12 +189,12 @@ gitlab Gemfile
# Misc
-gem 'version_sorter', '~> 2.1.0'
+gem 'version_sorter', '~> 2.1'
-gem 'version_sorter', '~> 2.2.4'
+gem 'version_sorter', '~> 2.2', '>= 2.2.4'
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1'
@@ -193,7 +193,7 @@ gem 'js_regex', '~> 3.1'
@@ -192,7 +192,7 @@ gem 'js_regex', '~> 3.1'
gem 'device_detector'
# Cache
@ -207,7 +203,7 @@ gitlab Gemfile
# Redis
gem 'redis', '~> 3.2'
@@ -203,7 +203,7 @@ gem 'connection_pool', '~> 2.0'
@@ -202,7 +202,7 @@ gem 'connection_pool', '~> 2.0'
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
@ -216,7 +212,7 @@ gitlab Gemfile
# JIRA integration
gem 'jira-ruby', '~> 1.4'
@@ -212,7 +212,7 @@ gem 'jira-ruby', '~> 1.4'
@@ -211,7 +211,7 @@ gem 'jira-ruby', '~> 1.4'
gem 'flowdock', '~> 0.7'
# Slack integration
@ -225,7 +221,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -224,11 +224,11 @@ gem 'asana', '~> 0.8.1'
@@ -223,11 +223,11 @@ gem 'asana', '~> 0.8.1'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -235,11 +231,11 @@ gitlab Gemfile
# Sanitize user input
gem 'sanitize', '~> 4.6'
-gem 'babosa', '~> 1.0.2'
+gem 'babosa', '~> 1.0', '>= 1.0.2
+gem 'babosa', '~> 1.0', '>= 1.0.2'
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -237,10 +237,10 @@ gem 'loofah', '~> 2.2'
@@ -236,10 +236,10 @@ gem 'loofah', '~> 2.2'
gem 'licensee', '~> 8.9'
# Protect against bruteforcing
@ -252,7 +248,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -258,41 +258,41 @@ gem 'chronic_duration', '~> 0.10.6'
@@ -257,39 +257,39 @@ gem 'chronic_duration', '~> 0.10.6'
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -267,12 +263,8 @@ gitlab Gemfile
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2'
-gem 'jquery-atwho-rails', '~> 1.3.2'
+gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
gem 'request_store', '~> 1.3'
-gem 'select2-rails', '~> 3.5.9'
-gem 'virtus', '~> 1.0.1'
+gem 'select2-rails', '~> 3.5', '>= 3.5.9'
+gem 'virtus', '~> 1.0', '>= 1.0.1'
gem 'base32', '~> 0.3.0'
@ -300,7 +292,7 @@ gitlab Gemfile
gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.2.0', group: :mysql
-gem 'peek-pg', '~> 1.3.0', group: :postgres
+gem 'peek-mysql2', '~> 1.2', group: :mysq
+gem 'peek-mysql2', '~> 1.2', group: :mysql
+gem 'peek-pg', '~> 1.3', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
-gem 'peek-redis', '~> 1.2.0'
@ -308,7 +300,7 @@ gitlab Gemfile
# Metrics
group :metrics do
@@ -318,54 +318,54 @@ group :development do
@@ -315,54 +315,54 @@ group :development do
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
# Better errors handler
@ -322,7 +314,7 @@ gitlab Gemfile
end
group :development, :test do
gem 'bootsnap', '~> 1.3'
gem 'bootsnap', '~> 1.4'
- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
- gem 'pry-byebug', '~> 3.5.1', platform: :mri
+ gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
@ -378,7 +370,7 @@ gitlab Gemfile
gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.17'
@@ -374,18 +374,18 @@ group :development, :test do
@@ -371,18 +371,18 @@ group :development, :test do
gem 'stackprof', '~> 0.2.10', require: false
@ -392,18 +384,18 @@ gitlab Gemfile
- gem 'shoulda-matchers', '~> 3.1.2', require: false
- gem 'email_spec', '~> 2.2.0'
- gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 2.3.2'
- gem 'webmock', '~> 3.5.1'
+ gem 'shoulda-matchers', '~> 3.1', '>= 3.1.2', require: false
+ gem 'email_spec', '~> 2.2'
+ gem 'json-schema', '~> 2.8'
+ gem 'webmock', '~> 2.3', '>= 2.3.2'
+ gem 'webmock', '~> 3.5', '>= 3.5.1'
gem 'rails-controller-testing'
- gem 'sham_rack', '~> 1.3.6'
+ gem 'sham_rack', '~> 1.3', '>= 1.3.6'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.2.5'
gem 'rspec_junit_formatter'
@@ -405,15 +405,15 @@ gem 'rbtrace', '~> 0.4', require: false
@@ -402,11 +402,11 @@ gem 'rbtrace', '~> 0.4', require: false
gem 'oauth2', '~> 1.4'
# Health check
@ -418,18 +410,14 @@ gitlab Gemfile
# SSH host key support
gem 'net-ssh', '~> 5.0'
-gem 'sshkey', '~> 1.9.0'
+gem 'sshkey', '~> 1.9'
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -422,12 +422,12 @@ group :ed25519 do
@@ -419,13 +419,13 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.10.0', require: 'gitaly'
-gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.19', require: 'gitaly'
-gem 'grpc', '~> 1.15.0'
+gem 'gitaly-proto', '~> 1.10', require: 'gitaly'
+gem 'grpc', '~> 1.15'
gem 'google-protobuf', '~> 3.6'