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

fix patch

Browse source
This commit is contained in:
Pirate Praveen 2018-03-27 22:47:51 +05:30
parent 340c2f4f25
commit ca3485e31f
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,7 @@ gitlab Gemfile
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.2' gem 'carrierwave', '~> 1.2'
@@ -119,32 +119,33 @@ @@ -119,32 +119,32 @@
gem 'unf', '~> 0.1.4' gem 'unf', '~> 0.1.4'
# Seed data # Seed data
@ -136,8 +136,8 @@ gitlab Gemfile
gem 'rouge', '~> 2.0' gem 'rouge', '~> 2.0'
gem 'truncato', '~> 0.7.9' gem 'truncato', '~> 0.7.9'
-gem 'bootstrap_form', '~> 2.7.0' -gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.2'
+gem 'bootstrap_form', '~> 2.7' +gem 'bootstrap_form', '~> 2.7'
gem 'nokogiri', '~> 1.8.2'
+gem 'nokogiri', '~> 1.8', '>= 1.8.2' +gem 'nokogiri', '~> 1.8', '>= 1.8.2'
# Diffs # Diffs
@ -151,7 +151,7 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4' gem 'unicorn-worker-killer', '~> 0.4.4'
end end
@@ -157,7 +158,7 @@ @@ -157,7 +157,7 @@
# Background jobs # Background jobs
gem 'sidekiq', '~> 5.0' gem 'sidekiq', '~> 5.0'
gem 'sidekiq-cron', '~> 0.6.0' gem 'sidekiq-cron', '~> 0.6.0'
@ -160,7 +160,7 @@ gitlab Gemfile
gem 'sidekiq-limit_fetch', '~> 3.4', require: false gem 'sidekiq-limit_fetch', '~> 3.4', require: false
# Cron Parser # Cron Parser
@@ -170,36 +171,36 @@ @@ -170,36 +170,36 @@
gem 'rainbow', '~> 2.2' gem 'rainbow', '~> 2.2'
# GitLab settings # GitLab settings
@ -204,7 +204,7 @@ gitlab Gemfile
# Asana integration # Asana integration
gem 'asana', '~> 0.6.0' gem 'asana', '~> 0.6.0'
@@ -208,35 +209,35 @@ @@ -208,35 +208,35 @@
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration # Kubernetes integration
@ -249,7 +249,7 @@ gitlab Gemfile
# Faster blank # Faster blank
gem 'fast_blank' gem 'fast_blank'
@@ -248,45 +249,45 @@ @@ -248,45 +248,45 @@
gem 'webpack-rails', '~> 0.9.10' gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0' gem 'rack-proxy', '~> 0.6.0'
@ -318,7 +318,7 @@ gitlab Gemfile
# Metrics # Metrics
group :metrics do group :metrics do
@@ -381,7 +382,7 @@ @@ -381,7 +381,7 @@
gem 'test-prof', '~> 0.2.5' gem 'test-prof', '~> 0.2.5'
end end
@ -327,7 +327,7 @@ gitlab Gemfile
gem 'mail_room', '~> 0.9.1' gem 'mail_room', '~> 0.9.1'
@@ -397,12 +398,12 @@ @@ -397,12 +397,12 @@
gem 'health_check', '~> 2.6.0' gem 'health_check', '~> 2.6.0'
# System information # System information
@ -344,7 +344,7 @@ gitlab Gemfile
# Required for ED25519 SSH host key support # Required for ED25519 SSH host key support
group :ed25519 do group :ed25519 do
@@ -418,7 +419,7 @@ @@ -418,7 +418,7 @@
# Locked until https://github.com/google/protobuf/issues/4210 is closed # Locked until https://github.com/google/protobuf/issues/4210 is closed
gem 'google-protobuf', '= 3.5.1' gem 'google-protobuf', '= 3.5.1'
@ -353,7 +353,7 @@ gitlab Gemfile
# Feature toggles # Feature toggles
gem 'flipper', '~> 0.11.0' gem 'flipper', '~> 0.11.0'
@@ -430,4 +431,4 @@ @@ -430,4 +430,4 @@
gem 'grape_logging', '~> 1.7' gem 'grape_logging', '~> 1.7'
# Asset synchronization # Asset synchronization