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

Merge branch 'master' into stretch-backports

Browse source
This commit is contained in:
Pirate Praveen 2018-06-27 16:29:00 +05:30
commit 45ec2a576f
13 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
debian/changelog vendored
View file

@ -1,16 +1,18 @@
gitlab (10.7.5+dfsg-4~bpo9+1) stretch-backports; urgency=medium
gitlab (10.7.6+dfsg-1~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- Pirate Praveen <praveen@debian.org> Sun, 03 Jun 2018 21:03:45 +0530
gitlab (10.7.5+dfsg-4) experimental; urgency=medium
gitlab (10.7.6+dfsg-1) experimental; urgency=medium
* New upstream version 10.7.6+dfsg
* Refresh patches
* Move common dependencies to gitlab-common
* Don't remove gitlab_data_dir in purge
* Support upgrading from 8.13 to 10.x
-- Pirate Praveen <praveen@debian.org> Thu, 21 Jun 2018 21:42:45 +0530
-- Pirate Praveen <praveen@debian.org> Wed, 27 Jun 2018 16:14:20 +0530
gitlab (10.7.5+dfsg-3) experimental; urgency=medium

1
debian/control vendored
View file

@ -17,6 +17,7 @@ Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends: ${shlibs:Depends}, ${misc:Depends},
gitlab-common,
ruby | ruby-interpreter,
lsb-base (>= 3.0-6),
rake (>= 12.3.0~),
bundler,

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

@ -75,8 +75,8 @@ gitlab Gemfile
# Browser detection
gem 'browser', '~> 2.2'
@@ -93,12 +93,12 @@
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
@@ -86,12 +86,12 @@
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
# Language detection
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
@ -90,7 +90,7 @@ gitlab Gemfile
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -107,7 +107,7 @@
@@ -100,7 +100,7 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -99,7 +99,7 @@ gitlab Gemfile
# Files attachments
gem 'carrierwave', '~> 1.2'
@@ -116,7 +116,7 @@
@@ -109,7 +109,7 @@
gem 'dropzonejs-rails', '~> 0.7.1'
# for backups
@ -108,7 +108,7 @@ gitlab Gemfile
gem 'fog-core', '~> 1.44'
gem 'fog-google', '~> 1.3.3'
gem 'fog-local', '~> 0.3'
@@ -131,32 +131,32 @@
@@ -124,32 +124,32 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -133,7 +133,7 @@ gitlab Gemfile
-gem 'asciidoctor', '~> 1.5.6'
+gem 'asciidoctor', '~> 1.5', '>= 1.5.6'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 2.0'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
-gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.2'
@ -151,7 +151,7 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -169,7 +169,7 @@
@@ -162,7 +162,7 @@
# Background jobs
gem 'sidekiq', '~> 5.0'
gem 'sidekiq-cron', '~> 0.6.0'
@ -160,7 +160,7 @@ gitlab Gemfile
gem 'sidekiq-limit_fetch', '~> 3.4', require: false
# Cron Parser
@@ -182,36 +182,36 @@
@@ -175,36 +175,36 @@
gem 'rainbow', '~> 2.2'
# GitLab settings
@ -204,7 +204,7 @@ gitlab Gemfile
# Asana integration
gem 'asana', '~> 0.6.0'
@@ -223,11 +223,11 @@
@@ -216,11 +216,11 @@
gem 'kubeclient', '~> 3.0'
# d3
@ -212,13 +212,14 @@ gitlab Gemfile
+gem 'd3_rails', '~> 3.5'
# Sanitize user input
gem 'sanitize', '~> 2.0'
-gem 'sanitize', '~> 4.6.5'
-gem 'babosa', '~> 1.0.2'
+gem 'sanitize', '~> 4.6', '>= 4.6.5'
+gem 'babosa', '~> 1.0', '>= 1.0.2'
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -236,13 +236,13 @@
@@ -229,13 +229,13 @@
gem 'licensee', '~> 8.9'
# Protect against bruteforcing
@ -235,7 +236,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -257,43 +257,43 @@
@@ -250,43 +250,43 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
@ -296,7 +297,7 @@ gitlab Gemfile
# Metrics
group :metrics do
@@ -405,12 +405,12 @@
@@ -398,12 +398,12 @@
gem 'health_check', '~> 2.6.0'
# System information
@ -313,7 +314,7 @@ gitlab Gemfile
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -421,12 +421,12 @@
@@ -414,12 +414,12 @@
# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.96.0', require: 'gitaly'
@ -329,7 +330,7 @@ gitlab Gemfile
# Feature toggles
gem 'flipper', '~> 0.13.0'
@@ -438,4 +438,4 @@
@@ -431,4 +431,4 @@
gem 'grape_logging', '~> 1.7'
# Asset synchronization

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
+++ b/Gemfile
@@ -281,7 +281,6 @@
@@ -274,7 +274,6 @@
gem 'rails-i18n', gem_versions['rails-i18n']
gem 'gettext_i18n_rails', '~> 1.8'
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'
@@ -306,21 +305,6 @@
@@ -299,21 +298,6 @@
gem 'raindrops', '~> 0.18'
end

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -306,7 +306,7 @@
@@ -299,7 +299,7 @@
gem 'raindrops', '~> 0.18'
end
@ -9,7 +9,7 @@
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.4.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@@ -361,9 +361,9 @@
@@ -354,9 +354,9 @@
gem 'simple_po_parser', '~> 1.1.2', require: false
gem 'timecop', '~> 0.8.0'

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

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

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -288,7 +288,6 @@
@@ -281,7 +281,6 @@
# Perf bar
gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2'

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

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

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

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

2
debian/patches/0360-relax-rdoc.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -141,7 +141,7 @@
@@ -134,7 +134,7 @@
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'

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

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

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

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -98,7 +98,7 @@
@@ -91,7 +91,7 @@
# API
gem 'grape', '~> 1.0'

4
debian/patches/0396-relax-asciidoctor-plantuml.patch vendored
View file

@ -2,12 +2,12 @@ https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18643
--- a/Gemfile
+++ b/Gemfile
@@ -146,7 +146,7 @@
@@ -139,7 +139,7 @@
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5', '>= 1.5.6'
-gem 'asciidoctor-plantuml', '0.0.8'
+gem 'asciidoctor-plantuml', '~> 0.0.8'
gem 'rouge', '~> 2.0'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
gem 'bootstrap_form', '~> 2.7'