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:
Praveen Arimbrathodiyil 2016-06-16 23:10:45 +05:30
parent d987b6228e
commit d73fd0dd66
8 changed files with 41 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
gitlab (8.9.0+dfsg~rc4-1) UNRELEASED; urgency=medium
* New upstream release candidate
* Refresh patches
-- Pirate Praveen <praveen@debian.org> Thu, 16 Jun 2016 21:51:02 +0530
gitlab (8.8.2+dfsg-5) unstable; urgency=medium gitlab (8.8.2+dfsg-5) unstable; urgency=medium
* Relax dependencies for all stable libraries (>= 1.0) (Closes: #827374) * Relax dependencies for all stable libraries (>= 1.0) (Closes: #827374)

15
debian/patches/0016-loosen-fog.patch vendored
View file

@ -1,15 +0,0 @@
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2807
Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -85,7 +85,7 @@ gem "carrierwave", '~> 0.10.0'
gem 'dropzonejs-rails', '~> 0.7.1'
# for aws storage
-gem "fog", "~> 1.36.0"
+gem "fog", "~> 1.34"
gem "unf", '~> 0.1.4'
# Authorization

2
debian/patches/0018-loosen-rdoc.patch vendored
View file

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -100,7 +100,7 @@ gem 'task_list', '~> 1.0.2', require @@ -107,7 +107,7 @@ gem 'task_list', '~> 1.0.2', require
gem 'github-markup', '~> 1.3.1' gem 'github-markup', '~> 1.3.1'
gem 'redcarpet', '~> 3.3.3' gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.2.9' gem 'RedCloth', '~> 4.2.9'

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

@ -14,7 +14,7 @@ Index: gitlab/Gemfile
# Responders respond_to and respond_with # Responders respond_to and respond_with
gem 'responders', '~> 2.0' gem 'responders', '~> 2.0'
@@ -11,31 +11,31 @@ gem 'responders', '~> 2.0' @@ -11,7 +11,7 @@ gem 'responders', '~> 2.0'
gem 'sprockets', '~> 3.3' gem 'sprockets', '~> 3.3'
# Default values for AR models # Default values for AR models
@ -23,13 +23,10 @@ Index: gitlab/Gemfile
# Supported DBs # Supported DBs
gem "mysql2", '~> 0.3.16', group: :mysql gem "mysql2", '~> 0.3.16', group: :mysql
gem "pg", '~> 0.18.2', group: :postgres @@ -20,21 +20,21 @@ gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries # Authentication libraries
-gem 'devise', '~> 3.5.4' gem 'devise', '~> 4.0'
+gem 'devise', '~> 3.5', '>= 3.5.4'
gem 'doorkeeper', '~> 3.1' gem 'doorkeeper', '~> 3.1'
gem 'devise-async', '~> 0.9.0'
-gem 'omniauth', '~> 1.3.1' -gem 'omniauth', '~> 1.3.1'
-gem 'omniauth-auth0', '~> 1.4.1' -gem 'omniauth-auth0', '~> 1.4.1'
+gem 'omniauth', '~> 1.3', '>= 1.3.1' +gem 'omniauth', '~> 1.3', '>= 1.3.1'
@ -59,19 +56,20 @@ Index: gitlab/Gemfile
gem 'jwt' gem 'jwt'
# Spam and anti-bot protection # Spam and anti-bot protection
@@ -43,12 +43,12 @@ gem 'recaptcha', require: 'recaptcha/rai @@ -42,13 +42,13 @@ gem 'recaptcha', '~> 3.0', require: 'rec
gem 'akismet', '~> 2.0' gem 'akismet', '~> 2.0'
# Two-factor authentication # Two-factor authentication
-gem 'devise-two-factor', '~> 2.0.0' -gem 'devise-two-factor', '~> 3.0.0'
+gem 'devise-two-factor', '~> 2.0' +gem 'devise-two-factor', '~> 3.0'
gem 'rqrcode-rails3', '~> 0.1.7' gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 1.3.4' -gem 'attr_encrypted', '~> 3.0.0'
+gem 'attr_encrypted', '~> 1.3', '>= 1.3.4' +gem 'attr_encrypted', '~> 3.0'
gem 'u2f', '~> 0.2.1'
# Browser detection # Browser detection
-gem "browser", '~> 1.0.0' -gem "browser", '~> 2.0.3'
+gem "browser", '~> 1.0' +gem "browser", '~> 2.0', '>= 2.0.3'
# Extracting information from a git repository # Extracting information from a git repository
# Provide access to Gitlab::Git library # Provide access to Gitlab::Git library
@ -89,7 +87,7 @@ Index: gitlab/Gemfile
# API # API
gem 'grape', '~> 0.13.0' gem 'grape', '~> 0.13.0'
@@ -92,31 +92,31 @@ gem "unf", '~> 0.1.4' @@ -99,31 +99,31 @@ gem "unf", '~> 0.1.4'
gem "six", '~> 0.2.0' gem "six", '~> 0.2.0'
# Seed data # Seed data
@ -104,7 +102,7 @@ Index: gitlab/Gemfile
-gem 'RedCloth', '~> 4.2.9' -gem 'RedCloth', '~> 4.2.9'
+gem 'html-pipeline', '~> 1.11' +gem 'html-pipeline', '~> 1.11'
+gem 'task_list', '~> 1.0', '>= 1.0.2', require: 'task_list/railtie' +gem 'task_list', '~> 1.0', '>= 1.0.2', require: 'task_list/railtie'
+gem 'github-markup', '~> 1.3' +gem 'github-markup', '~> 1.3', '>= 1.3.1'
+gem 'redcarpet', '~> 3.3', '>= 3.3.3' +gem 'redcarpet', '~> 3.3', '>= 3.3.3'
+gem 'RedCloth', '~> 4.2', '>= 4.2.9' +gem 'RedCloth', '~> 4.2', '>= 4.2.9'
gem 'rdoc', '~> 4.1' gem 'rdoc', '~> 4.1'
@ -112,9 +110,8 @@ Index: gitlab/Gemfile
gem 'creole', '~> 0.5.0' gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1' gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.2' -gem 'asciidoctor', '~> 1.5.2'
-gem 'rouge', '~> 1.10.1'
+gem 'asciidoctor', '~> 1.5', '>= 1.5.2' +gem 'asciidoctor', '~> 1.5', '>= 1.5.2'
+gem 'rouge', '~> 1.10', '>= 1.10.1' gem 'rouge', '~> 1.11'
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@ -132,7 +129,7 @@ Index: gitlab/Gemfile
gem 'unicorn-worker-killer', '~> 0.4.2' gem 'unicorn-worker-killer', '~> 0.4.2'
end end
@@ -129,7 +129,7 @@ gem 'after_commit_queue' @@ -136,7 +136,7 @@ gem 'after_commit_queue'
gem 'acts-as-taggable-on', '~> 3.4' gem 'acts-as-taggable-on', '~> 3.4'
# Background jobs # Background jobs
@ -141,8 +138,8 @@ Index: gitlab/Gemfile
gem 'sidekiq', '~> 4.0' gem 'sidekiq', '~> 4.0'
gem 'sidekiq-cron', '~> 0.4.0' gem 'sidekiq-cron', '~> 0.4.0'
gem 'redis-namespace' gem 'redis-namespace'
@@ -141,33 +141,33 @@ gem "httparty", '~> 0.13.3' @@ -148,33 +148,33 @@ gem "httparty", '~> 0.13.3'
gem "colorize", '~> 0.7.0' gem "rainbow", '~> 2.1.0'
# GitLab settings # GitLab settings
-gem 'settingslogic', '~> 2.0.9' -gem 'settingslogic', '~> 2.0.9'
@ -182,17 +179,13 @@ Index: gitlab/Gemfile
# Asana integration # Asana integration
gem 'asana', '~> 0.4.0' gem 'asana', '~> 0.4.0'
@@ -176,61 +176,61 @@ gem 'asana', '~> 0.4.0' @@ -183,29 +183,29 @@ gem 'asana', '~> 0.4.0'
gem 'ruby-fogbugz', '~> 0.2.1' gem 'ruby-fogbugz', '~> 0.2.1'
# d3 # d3
-gem 'd3_rails', '~> 3.5.0' -gem 'd3_rails', '~> 3.5.0'
+gem 'd3_rails', '~> 3.5' +gem 'd3_rails', '~> 3.5'
#cal-heatmap
-gem 'cal-heatmap-rails', '~> 3.6.0'
+gem 'cal-heatmap-rails', '~> 3.6'
# underscore-rails # underscore-rails
-gem "underscore-rails", "~> 1.8.0" -gem "underscore-rails", "~> 1.8.0"
+gem "underscore-rails", "~> 1.8" +gem "underscore-rails", "~> 1.8"
@ -224,6 +217,9 @@ Index: gitlab/Gemfile
# Detect and convert string character encoding # Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.3' gem 'charlock_holmes', '~> 0.7.3'
@@ -213,31 +213,31 @@ gem 'charlock_holmes', '~> 0.7.3'
# Parse duration
gem 'chronic_duration', '~> 0.10.6'
-gem "sass-rails", '~> 5.0.0' -gem "sass-rails", '~> 5.0.0'
-gem "coffee-rails", '~> 4.1.0' -gem "coffee-rails", '~> 4.1.0'
@ -266,11 +262,11 @@ Index: gitlab/Gemfile
gem 'sentry-raven', '~> 0.15' gem 'sentry-raven', '~> 0.15'
-gem 'premailer-rails', '~> 1.9.0' -gem 'premailer-rails', '~> 1.9.0'
+gem 'premailer-rails', '~> 1.9', '>= 1.9.0' +gem 'premailer-rails', '~> 1.9'
# Metrics # Metrics
group :metrics do group :metrics do
@@ -318,7 +318,7 @@ end @@ -329,7 +329,7 @@ end
gem "newrelic_rpm", '~> 3.14' gem "newrelic_rpm", '~> 3.14'
@ -279,7 +275,7 @@ Index: gitlab/Gemfile
gem "mail_room", "~> 0.7" gem "mail_room", "~> 0.7"
@@ -329,10 +329,10 @@ gem 'activerecord-session_store', '~> 0. @@ -340,10 +340,10 @@ gem 'activerecord-session_store', '~> 1.
gem "nested_form", '~> 0.3.2' gem "nested_form", '~> 0.3.2'
# OAuth # OAuth

15
debian/patches/0051-allow-stable-minor-8.9.patch vendored
View file

@ -1,15 +0,0 @@
relax minor updates for 8.9 (fix #827013)
Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -121,7 +121,7 @@ group :unicorn do
end
# State machine
-gem "state_machines-activerecord", '~> 0.3.0'
+gem "state_machines-activerecord", '~> 0.4.0'
# Run events after state machine commits
gem 'after_commit_queue'

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

@ -4,13 +4,13 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -239,85 +239,6 @@ group :metrics do @@ -246,89 +246,6 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false gem 'influxdb', '~> 0.2', require: false
end end
-group :development do -group :development do
- gem "foreman" - gem "foreman"
- gem 'brakeman', '~> 3.2.0', require: false - gem 'brakeman', '~> 3.3.0', require: false
- -
- gem 'letter_opener_web', '~> 1.3.0' - gem 'letter_opener_web', '~> 1.3.0'
- gem 'quiet_assets', '~> 1.0.2' - gem 'quiet_assets', '~> 1.0.2'
@ -62,15 +62,19 @@ Index: gitlab/Gemfile
- gem 'spring-commands-spinach', '~> 1.1.0' - gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'spring-commands-teaspoon', '~> 0.0.2'
- -
- gem 'rubocop', '~> 0.38.0', require: false - gem 'rubocop', '~> 0.40.0', require: false
- gem 'rubocop-rspec', '~> 1.5.0', require: false
- gem 'scss_lint', '~> 0.47.0', require: false - gem 'scss_lint', '~> 0.47.0', require: false
- gem 'coveralls', '~> 0.8.2', require: false - gem 'coveralls', '~> 0.8.2', require: false
- gem 'simplecov', '~> 0.11.0', require: false - gem 'simplecov', '~> 0.11.0', require: false
- gem 'flog', require: false - gem 'flog', require: false
- gem 'flay', require: false - gem 'flay', require: false
- gem 'bundler-audit', require: false - gem 'bundler-audit', require: false
- -
- gem 'benchmark-ips', require: false - gem 'benchmark-ips', require: false
-
- gem "license_finder", require: false
- gem 'knapsack'
-end -end
- -
-group :test do -group :test do

2
debian/patches/0108-make-mysql-optional.patch vendored
View file

@ -22,4 +22,4 @@ Index: gitlab/Gemfile
+gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres" +gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
# Authentication libraries # Authentication libraries
gem 'devise', '~> 3.5', '>= 3.5.4' gem 'devise', '~> 4.0'

2
debian/patches/series vendored
View file

@ -1,10 +1,8 @@
003-loosen-sprockets.patch 003-loosen-sprockets.patch
0005-use-debian-omniauth-ldap.patch 0005-use-debian-omniauth-ldap.patch
0016-loosen-fog.patch
0018-loosen-rdoc.patch 0018-loosen-rdoc.patch
0042-relax-grape-entity.patch 0042-relax-grape-entity.patch
0050-relax-stable-libs.patch 0050-relax-stable-libs.patch
0051-allow-stable-minor-8.9.patch
0100-remove-development-test.patch 0100-remove-development-test.patch
0108-make-mysql-optional.patch 0108-make-mysql-optional.patch
source-init-functions.patch source-init-functions.patch