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:
Sruthi Chandran 2019-02-15 18:28:22 +05:30
parent ac53515c13
commit 6bc2d85f7b
19 changed files with 209 additions and 558 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,16 +3,16 @@ gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
gem 'rails', gem_versions['rails']
gem 'rails', '5.0.7.1'
-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
@@ -25,7 +25,7 @@
@@ -9,7 +9,7 @@
# Responders respond_to and respond_with
gem 'responders', '~> 2.0'
@ -20,8 +20,8 @@ gitlab Gemfile
+gem 'sprockets', '~> 3.7'
# Default values for AR models
if rails5?
@@ -48,35 +48,35 @@
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
@@ -28,57 +28,57 @@
gem 'doorkeeper', '~> 4.3'
gem 'doorkeeper-openid_connect', '~> 1.5'
gem 'omniauth', '~> 1.8'
@ -35,7 +35,7 @@ gitlab Gemfile
gem 'omniauth-github', '~> 1.3'
-gem 'omniauth-gitlab', '~> 1.0.2'
+gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
gem 'omniauth-google-oauth2', '~> 0.5.3'
gem 'omniauth-google-oauth2', '~> 0.6.0'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.10'
@ -46,9 +46,9 @@ gitlab Gemfile
+gem 'omniauth_crowd', '~> 2.2'
gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'rack-oauth2', '~> 1.2.1'
-gem 'jwt', '~> 1.5.6'
-gem 'jwt', '~> 2.1.0'
+gem 'rack-oauth2', '~> 1.2', '>= 1.2.1'
+gem 'jwt', '~> 1.5', '>= 1.5.6'
+gem 'jwt', '~> 2.1'
# Spam and anti-bot protection
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
@ -64,11 +64,17 @@ gitlab Gemfile
# GitLab Pages
-gem 'validates_hostname', '~> 1.0.6'
-gem 'rubyzip', '~> 1.2.2', require: 'zip'
+gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
+gem 'rubyzip', '~> 1.2', '>= 1.2.2', require: 'zip'
# Browser detection
gem 'browser', '~> 2.5'
@@ -87,17 +87,17 @@
# GPG
-gem 'gpgme', '~> 2.0.18'
+gem 'gpgme', '~> 2.0', '>= 2.0.18'
# 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
@ -77,7 +83,8 @@ gitlab Gemfile
gem 'net-ldap'
# API
gem 'grape', '~> 1.1.0'
-gem 'grape', '~> 1.1.0'
+gem 'grape', '~> 1.1'
gem 'grape-entity', '~> 0.7.1'
-gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0', require: 'rack/cors'
@ -90,7 +97,7 @@ gitlab Gemfile
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -106,7 +106,7 @@
@@ -87,16 +87,16 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -98,8 +105,7 @@ gitlab Gemfile
+gem 'hamlit', '~> 2.8', '>= 2.8.8'
# Files attachments
# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged.
@@ -115,9 +115,9 @@
gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups
@ -111,7 +117,7 @@ gitlab Gemfile
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
@@ -130,39 +130,39 @@
@@ -109,33 +109,33 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -121,9 +127,10 @@ gitlab Gemfile
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.0.0'
+gem 'deckar01-task_list', '2.0'
gem 'gitlab-markup', '~> 1.6.5'
-gem 'gitlab-markup', '~> 1.6.5'
-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'deckar01-task_list', '2.0'
+gem 'gitlab-markup', '~> 1.6', '>= 1.6.5'
+gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
@ -134,15 +141,14 @@ gitlab Gemfile
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.8'
-gem 'asciidoctor-plantuml', '0.0.8'
+gem 'asciidoctor', '~> 1.5', '>= 1.5.8'
+gem 'asciidoctor-plantuml', '~> 0.0.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
-gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.2'
-gem 'nokogiri', '~> 1.8.5'
+gem 'bootstrap_form', '~> 2.7'
+gem 'nokogiri', '~> 1.8', '>= 1.8.2'
+gem 'nokogiri', '~> 1.8', '>= 1.8.5'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@ -153,7 +159,9 @@ gitlab Gemfile
+gem 'diffy', '~> 3.1'
# Application server
gem 'rack', gem_versions['rack']
# The 2.0.6 version of rack requires monkeypatch to be present in
@@ -144,7 +144,7 @@
gem 'rack', '2.0.6'
group :unicorn do
- gem 'unicorn', '~> 5.1.0'
@ -161,7 +169,7 @@ gitlab Gemfile
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@@ -178,9 +178,9 @@
@@ -160,9 +160,9 @@
gem 'acts-as-taggable-on', '~> 5.0'
# Background jobs
@ -170,10 +178,10 @@ gitlab Gemfile
gem 'sidekiq-cron', '~> 0.6.0'
-gem 'redis-namespace', '~> 1.6.0'
+gem 'redis-namespace', '~> 1.6'
gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch'
gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
@@ -196,14 +196,14 @@
@@ -178,23 +178,23 @@
gem 'ruby-progressbar'
# GitLab settings
@ -190,8 +198,10 @@ gitlab Gemfile
+gem 'version_sorter', '~> 2.1'
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 2.2.1'
@@ -212,7 +212,7 @@
-gem 'js_regex', '~> 2.2.1'
+gem 'js_regex', '~> 2.2', '>= 2.2.1'
# User agent parsing
gem 'device_detector'
# Cache
@ -200,7 +210,7 @@ gitlab Gemfile
# Redis
gem 'redis', '~> 3.2'
@@ -222,7 +222,7 @@
@@ -204,7 +204,7 @@
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
@ -209,7 +219,7 @@ gitlab Gemfile
# JIRA integration
gem 'jira-ruby', '~> 1.4'
@@ -231,7 +231,7 @@
@@ -213,7 +213,7 @@
gem 'flowdock', '~> 0.7'
# Slack integration
@ -218,7 +228,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5'
@@ -243,11 +243,11 @@
@@ -225,11 +225,11 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -232,7 +242,7 @@ gitlab Gemfile
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
@@ -256,10 +256,10 @@
@@ -238,10 +238,10 @@
gem 'licensee', '~> 8.9'
# Protect against bruteforcing
@ -245,13 +255,14 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
@@ -277,40 +277,40 @@
@@ -259,41 +259,41 @@
gem 'webpack-rails', '~> 0.9.10'
gem 'rack-proxy', '~> 0.6.0'
-gem 'sass-rails', '~> 5.0.6'
-gem 'uglifier', '~> 2.7.2'
+gem 'sass-rails', '~> 5.0', '>= 5.0.6'
gem 'sass', '~> 3.5'
-gem 'uglifier', '~> 2.7.2'
+gem 'uglifier', '~> 2.7', '>= 2.7.2'
-gem 'addressable', '~> 2.5.2'
@ -276,11 +287,12 @@ gitlab Gemfile
# I18n
gem 'ruby_parser', '~> 3.8', require: false
gem 'rails-i18n', gem_versions['rails-i18n']
gem 'rails-i18n', '~> 5.1'
-gem 'gettext_i18n_rails', '~> 1.8.0'
+gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
gem 'gettext', '~> 3.2.2', require: false, group: :development
-gem 'gettext', '~> 3.2.2', require: false, group: :development
+gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
-gem 'batch-loader', '~> 1.2.2'
+gem 'batch-loader', '~> 1.2', '>= 1.2.2'
@ -289,9 +301,9 @@ gitlab Gemfile
-gem 'peek', '~> 1.0.1'
+gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.1.0', group: :mysql
-gem 'peek-mysql2', '~> 1.2.0', group: :mysql
-gem 'peek-pg', '~> 1.3.0', group: :postgres
+gem 'peek-mysql2', '~> 1.1', group: :mysql
+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'
@ -299,7 +311,102 @@ gitlab Gemfile
# Metrics
group :metrics do
@@ -418,15 +418,15 @@
@@ -313,54 +313,54 @@
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
# Better errors handler
- gem 'better_errors', '~> 2.5.0'
+ gem 'better_errors', '~> 2.5'
gem 'binding_of_caller', '~> 0.8.0'
# thin instead webrick
- gem 'thin', '~> 1.7.0'
+ gem 'thin', '~> 1.7'
end
group :development, :test do
gem 'bootsnap', '~> 1.3'
- 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']
+ gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
gem 'awesome_print', require: false
- gem 'fuubar', '~> 2.2.0'
+ gem 'fuubar', '~> 2.2'
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 4.8.2'
- gem 'rspec-rails', '~> 3.7.0'
+ gem 'database_cleaner', '~> 1.7'
+ gem 'factory_bot_rails', '~> 4.8', '>= 4.8.2'
+ gem 'rspec-rails', '~> 3.7'
gem 'rspec-retry', '~> 0.4.5'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
gem 'rspec-parameterized', require: false
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.11.0'
+ gem 'minitest', '~> 5.11'
# Generate Fake data
gem 'ffaker', '~> 2.10'
- gem 'capybara', '~> 2.16.1'
- gem 'capybara-screenshot', '~> 1.0.18'
+ gem 'capybara', '~> 2.16', '>= 2.16.1'
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.18'
gem 'selenium-webdriver', '~> 3.12'
- gem 'spring', '~> 2.0.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
+ gem 'spring', '~> 2.0'
+ gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
gem 'gitlab-styles', '~> 2.4', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines
gem 'rubocop', '~> 0.54.0'
- gem 'rubocop-rspec', '~> 1.22.1'
+ gem 'rubocop-rspec', '~> 1.22', '>= 1.22.1'
gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.28.0', require: false
gem 'simplecov', '~> 0.14.0', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
- gem 'benchmark-ips', '~> 2.3.0', require: false
+ gem 'benchmark-ips', '~> 2.3', require: false
gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.17'
@@ -369,18 +369,18 @@
gem 'stackprof', '~> 0.2.10', require: false
- gem 'simple_po_parser', '~> 1.1.2', require: false
+ gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
gem 'timecop', '~> 0.8.0'
end
group :test do
- 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 '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 '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'
@@ -400,15 +400,15 @@
gem 'oauth2', '~> 1.4'
# Health check
@ -319,13 +426,13 @@ gitlab Gemfile
# Required for ED25519 SSH host key support
group :ed25519 do
@@ -435,12 +435,12 @@
@@ -417,12 +417,12 @@
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 1.3.0', require: 'gitaly'
-gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly'
-gem 'grpc', '~> 1.15.0'
+gem 'gitaly-proto', '~> 1.3', require: 'gitaly'
+gem 'gitaly-proto', '~> 1.5', require: 'gitaly'
+gem 'grpc', '~> 1.15'
gem 'google-protobuf', '~> 3.6'

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

@ -2,15 +2,15 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -300,7 +300,6 @@
gem 'rails-i18n', gem_versions['rails-i18n']
@@ -283,7 +283,6 @@
gem 'rails-i18n', '~> 5.1'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
-gem 'gettext', '~> 3.2.2', require: false, group: :development
-gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
gem 'batch-loader', '~> 1.2', '>= 1.2.2'
@@ -322,21 +321,6 @@
@@ -305,21 +304,6 @@
gem 'raindrops', '~> 0.18'
end
@ -22,13 +22,13 @@ Bundler will fail when it can't find these locally
- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
-
- # Better errors handler
- gem 'better_errors', '~> 2.5.0'
- gem 'better_errors', '~> 2.5'
- gem 'binding_of_caller', '~> 0.8.0'
-
- # thin instead webrick
- gem 'thin', '~> 1.7.0'
- gem 'thin', '~> 1.7'
-end
-
group :development, :test do
gem 'bootsnap', '~> 1.3'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']

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

@ -9,8 +9,8 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
--- a/Gemfile
+++ b/Gemfile
@@ -35,8 +35,9 @@
end
@@ -15,8 +15,9 @@
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
# Supported DBs
-gem 'mysql2', '~> 0.4.10', group: :mysql

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

@ -1,16 +1,16 @@
--- a/Gemfile
+++ b/Gemfile
@@ -322,7 +322,7 @@
@@ -305,7 +305,7 @@
gem 'raindrops', '~> 0.18'
end
-group :development, :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bootsnap', '~> 1.3'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.4.1', platform: :mri
@@ -374,9 +374,9 @@
gem 'simple_po_parser', '~> 1.1.2', require: false
gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
@@ -357,9 +357,9 @@
gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
gem 'timecop', '~> 0.8.0'
-end
@ -18,6 +18,6 @@
-group :test do
+#group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
gem 'shoulda-matchers', '~> 3.1', '>= 3.1.2', require: false
gem 'email_spec', '~> 2.2'
gem 'json-schema', '~> 2.8'

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

@ -1,11 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -380,7 +380,7 @@
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'
@@ -363,7 +363,7 @@
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', '>= 2.3.2'
gem 'rails-controller-testing' if rails5? # Rails5 only gem.
gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
gem 'sham_rack', '~> 1.3.6'
gem 'rails-controller-testing'
gem 'sham_rack', '~> 1.3', '>= 1.3.6'
gem 'concurrent-ruby', '~> 1.1'

2
debian/patches/0280-relax-pg.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@
@@ -17,7 +17,7 @@
# Supported DBs
ENV["DB"] ||= "postgresql"
gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"

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

@ -1,10 +1,10 @@
--- a/Gemfile
+++ b/Gemfile
@@ -307,7 +307,6 @@
@@ -290,7 +290,6 @@
# Perf bar
gem 'peek', '~> 1.0', '>= 1.0.1'
gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.1', group: :mysql
-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'

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

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

4
debian/patches/0400-Relax-recaptcha-version.patch vendored
View file

@ -8,8 +8,8 @@ Subject: Relax recaptcha version
--- a/Gemfile
+++ b/Gemfile
@@ -67,7 +67,7 @@
gem 'jwt', '~> 1.5', '>= 1.5.6'
@@ -47,7 +47,7 @@
gem 'jwt', '~> 2.1'
# Spam and anti-bot protection
-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'

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

@ -1,10 +1,10 @@
--- a/Gemfile
+++ b/Gemfile
@@ -207,7 +207,7 @@
@@ -189,7 +189,7 @@
gem 'version_sorter', '~> 2.1'
# Export Ruby Regex to Javascript
-gem 'js_regex', '~> 2.2.1'
-gem 'js_regex', '~> 2.2', '>= 2.2.1'
+gem 'js_regex', '~> 3.1'
# User agent parsing

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

@ -1,10 +1,10 @@
--- a/Gemfile
+++ b/Gemfile
@@ -136,7 +136,6 @@
@@ -115,7 +115,6 @@
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0'
-gem 'gitlab-markup', '~> 1.6.5'
-gem 'gitlab-markup', '~> 1.6', '>= 1.6.5'
gem 'github-markup', '~> 1.7', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'

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

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

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

@ -1,10 +1,10 @@
--- a/Gemfile
+++ b/Gemfile
@@ -317,7 +317,6 @@
@@ -300,7 +300,6 @@
if ENV["INCLUDE_TEST_DEPENDS"] == "true"
gem 'bootsnap', '~> 1.3'
- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.4.1', platform: :mri
- gem 'bullet', '~> 5.5', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'

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

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -325,7 +325,7 @@
gem 'database_cleaner', '~> 1.5.0'
gem 'factory_bot_rails', '~> 4.8.2'
- gem 'rspec-rails', '~> 3.7.0'
+ gem 'rspec-rails', '~> 3.7'
gem 'rspec-retry', '~> 0.4.5'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'

13
debian/patches/0470-relax-rails.patch vendored
View file

@ -1,11 +1,10 @@
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem_versions = {}
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
-gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11'
+gem_versions['rails'] = rails5? ? '~> 5.0' : '4.2.11'
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
-gem 'rails', '5.0.7.1'
+gem 'rails', '~> 5.0'
gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
# The 2.0.6 version of rack requires monkeypatch to be present in
# Improves copy-on-write performance for MRI

11
debian/patches/0480-relax-gitlab-sidekiq-fetcher.patch vendored
View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -176,7 +176,7 @@
gem 'sidekiq', '~> 5.2', '>= 5.2.1'
gem 'sidekiq-cron', '~> 0.6.0'
gem 'redis-namespace', '~> 1.6'
-gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch'
+gem 'gitlab-sidekiq-fetcher', '~> 0.3.0', require: 'sidekiq-reliable-fetch'
# Cron Parser
gem 'rufus-scheduler', '~> 3.4'

17
debian/patches/0510-remove-dev-dependencies.patch vendored
View file

@ -1,10 +1,10 @@
--- a/package.json
+++ b/package.json
@@ -118,45 +118,5 @@
@@ -118,48 +118,6 @@
"xterm": "^3.5.0"
},
"devDependencies": {
- "@gitlab/eslint-config": "^1.2.0",
- "@gitlab/eslint-config": "^1.4.0",
- "@vue/test-utils": "^1.0.0-beta.25",
- "axios-mock-adapter": "^1.15.0",
- "babel-core": "^7.0.0-bridge",
@ -17,10 +17,10 @@
- "babel-types": "^6.26.0",
- "chalk": "^2.4.1",
- "commander": "^2.18.0",
- "eslint": "~5.6.0",
- "eslint": "~5.9.0",
- "eslint-import-resolver-jest": "^2.1.1",
- "eslint-import-resolver-webpack": "^0.10.1",
- "eslint-plugin-html": "4.0.5",
- "eslint-plugin-html": "5.0.0",
- "eslint-plugin-import": "^2.14.0",
- "eslint-plugin-jasmine": "^2.10.1",
- "eslint-plugin-jest": "^22.1.0",
@ -43,6 +43,9 @@
- "karma-webpack": "^4.0.0-beta.0",
- "nodemon": "^1.18.4",
- "prettier": "1.15.2",
- "webpack-dev-server": "^3.1.10"
}
}
- "vue-jest": "^3.0.1",
- "webpack-dev-server": "^3.1.10",
- "yarn-deduplicate": "^1.0.5"
},
"engines": {
"yarn": "^1.10.0"

448
debian/patches/0680-rails-5_2.patch vendored
View file

@ -12,7 +12,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
--- a/Gemfile
+++ b/Gemfile
@@ -40,7 +40,7 @@
@@ -20,7 +20,7 @@
gem 'pg', '~> 0.19' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'rugged', '~> 0.27'
@ -21,97 +21,9 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
gem 'faraday', '~> 0.12'
@@ -323,7 +323,7 @@
gem 'awesome_print', require: false
gem 'fuubar', '~> 2.2.0'
- gem 'database_cleaner', '~> 1.5.0'
+ gem 'database_cleaner', '~> 1.7.0'
gem 'factory_bot_rails', '~> 4.8.2'
gem 'rspec-rails', '~> 3.7'
gem 'rspec-retry', '~> 0.4.5'
@@ -376,7 +376,7 @@
gem 'rails-controller-testing' if rails5? # Rails5 only gem.
gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
gem 'sham_rack', '~> 1.3.6'
- gem 'concurrent-ruby', '~> 1.1'
+ #gem 'concurrent-ruby'
gem 'test-prof', '~> 0.2.5'
gem 'rspec_junit_formatter'
end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,41 +4,45 @@
RedCloth (4.3.2)
abstract_type (0.0.7)
ace-rails-ap (4.1.2)
- actioncable (5.0.7)
- actionpack (= 5.0.7)
- nio4r (>= 1.2, < 3.0)
- websocket-driver (~> 0.6.1)
- actionmailer (5.0.7)
- actionpack (= 5.0.7)
- actionview (= 5.0.7)
- activejob (= 5.0.7)
+ actioncable (5.2.2)
+ actionpack (= 5.2.2)
+ nio4r (~> 2.0)
+ websocket-driver (>= 0.6.1)
+ actionmailer (5.2.2)
+ actionpack (= 5.2.2)
+ actionview (= 5.2.2)
+ activejob (= 5.2.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.7)
- actionview (= 5.0.7)
- activesupport (= 5.0.7)
+ actionpack (5.2.2)
+ actionview (= 5.2.2)
+ activesupport (= 5.2.2)
rack (~> 2.0)
- rack-test (~> 0.6.3)
+ rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.7)
- activesupport (= 5.0.7)
+ actionview (5.2.2)
+ activesupport (= 5.2.2)
builder (~> 3.1)
- erubis (~> 2.7.0)
+ erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.0.7)
- activesupport (= 5.0.7)
+ activejob (5.2.2)
+ activesupport (= 5.2.2)
globalid (>= 0.3.6)
- activemodel (5.0.7)
- activesupport (= 5.0.7)
- activerecord (5.0.7)
- activemodel (= 5.0.7)
- activesupport (= 5.0.7)
- arel (~> 7.0)
+ activemodel (5.2.2)
+ activesupport (= 5.2.2)
+ activerecord (5.2.2)
+ activemodel (= 5.2.2)
+ activesupport (= 5.2.2)
+ arel (>= 9.0)
activerecord_sane_schema_dumper (1.0)
rails (>= 5, < 6)
- activesupport (5.0.7)
+ activestorage (5.2.2)
+ actionpack (= 5.2.2)
+ activerecord (= 5.2.2)
+ marcel (~> 0.3.1)
+ activesupport (5.2.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -52,7 +56,7 @@
@@ -52,7 +52,7 @@
public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1)
akismet (2.0.0)
@ -120,16 +32,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
asana (0.8.1)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
@@ -140,7 +144,7 @@
css_parser (1.5.0)
addressable
daemons (1.2.6)
- database_cleaner (1.5.3)
+ database_cleaner (1.7.0)
debug_inspector (0.0.3)
debugger-ruby_core_source (1.3.8)
deckar01-task_list (2.0.0)
@@ -183,7 +187,6 @@
@@ -183,7 +183,6 @@
encryptor (3.0.0)
equalizer (0.0.11)
erubi (1.7.1)
@ -137,7 +40,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
escape_utils (1.2.1)
et-orbi (1.0.3)
tzinfo
@@ -253,8 +256,8 @@
@@ -253,8 +252,8 @@
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
@ -148,7 +51,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
@@ -326,8 +329,8 @@
@@ -326,8 +325,8 @@
grape-entity (0.7.1)
activesupport (>= 4.0)
multi_json (>= 1.3.2)
@ -159,83 +62,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
grape (~> 1.0)
rake (~> 12)
grape_logging (1.7.0)
@@ -381,7 +384,7 @@
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
- i18n (1.1.1)
+ i18n (1.2.0)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
ice_nine (0.11.2)
@@ -449,9 +452,11 @@
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
- mail (2.7.0)
+ mail (2.7.1)
mini_mime (>= 0.1.1)
mail_room (0.9.1)
+ marcel (0.3.3)
+ mimemagic (~> 0.3.2)
memoist (0.16.0)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
@@ -621,19 +626,20 @@
rack
rack-proxy (0.6.0)
rack
- rack-test (0.6.3)
- rack (>= 1.0)
- rails (5.0.7)
- actioncable (= 5.0.7)
- actionmailer (= 5.0.7)
- actionpack (= 5.0.7)
- actionview (= 5.0.7)
- activejob (= 5.0.7)
- activemodel (= 5.0.7)
- activerecord (= 5.0.7)
- activesupport (= 5.0.7)
+ rack-test (1.1.0)
+ rack (>= 1.0, < 3)
+ rails (5.2.2)
+ actioncable (= 5.2.2)
+ actionmailer (= 5.2.2)
+ actionpack (= 5.2.2)
+ actionview (= 5.2.2)
+ activejob (= 5.2.2)
+ activemodel (= 5.2.2)
+ activerecord (= 5.2.2)
+ activestorage (= 5.2.2)
+ activesupport (= 5.2.2)
bundler (>= 1.3.0)
- railties (= 5.0.7)
+ railties (= 5.2.2)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@@ -649,15 +655,15 @@
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
- railties (5.0.7)
- actionpack (= 5.0.7)
- activesupport (= 5.0.7)
+ railties (5.2.2)
+ actionpack (= 5.2.2)
+ activesupport (= 5.2.2)
method_source
rake (>= 0.8.7)
- thor (>= 0.18.1, < 2.0)
+ thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
raindrops (0.18.0)
- rake (12.3.1)
+ rake (12.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
@@ -922,7 +928,7 @@
@@ -923,7 +922,7 @@
hashdiff
webpack-rails (0.9.11)
railties (>= 3.2.0)
@ -244,19 +71,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
wikicloth (0.8.1)
@@ -969,10 +975,9 @@
chronic (~> 0.10.2)
chronic_duration (~> 0.10.6)
commonmarker (~> 0.17)
- concurrent-ruby (~> 1.1)
connection_pool (~> 2.0)
creole (~> 0.5.0)
- database_cleaner (~> 1.5.0)
+ database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.0.0)
device_detector
devise (~> 4.4)
@@ -1020,7 +1025,7 @@
@@ -1021,7 +1020,7 @@
gpgme (~> 2.0.18)
grape (~> 1.1.0)
grape-entity (~> 0.7.1)
@ -265,15 +80,6 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0)
@@ -1095,7 +1100,7 @@
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
- rails (= 5.0.7)
+ rails (= 5.2.2)
rails-controller-testing
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 5.1)
--- a/config/initializers/active_record_verbose_query_logs.rb
+++ /dev/null
@@ -1,56 +0,0 @@
@ -403,17 +209,6 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
+# end
+# end
+#end
--- a/config/initializers/new_framework_defaults.rb
+++ b/config/initializers/new_framework_defaults.rb
@@ -24,6 +24,7 @@
# Require `belongs_to` associations by default. Previous versions had false.
Rails.application.config.active_record.belongs_to_required_by_default = false
+# FIXME - check all callbacks - https://stackoverflow.com/questions/49744200/nomethoderror-undefined-method-halt-callback-chains-on-return-false-for-acti
# Do not halt callback chains when a callback returns false. Previous versions had true.
- ActiveSupport.halt_callback_chains_on_return_false = true
+# ActiveSupport.halt_callback_chains_on_return_false = true
end
--- a/config/initializers/postgresql_cte.rb
+++ b/config/initializers/postgresql_cte.rb
@@ -94,8 +94,8 @@
@ -427,17 +222,6 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
build_with(arel) if @values[:with]
--- a/config/initializers/postgresql_opclasses_support.rb
+++ b/config/initializers/postgresql_opclasses_support.rb
@@ -81,7 +81,7 @@
if index_name.length > max_index_length
raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' is too long; the limit is #{max_index_length} characters"
end
- if table_exists?(table_name) && index_name_exists?(table_name, index_name, false)
+ if table_exists?(table_name) && index_name_exists?(table_name, index_name)
raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' already exists"
end
index_columns = quoted_columns_for_index(column_names, options).join(", ")
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -243,7 +243,7 @@
@ -449,17 +233,6 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
optional 'file.path', type: String, desc: %q(path to locally stored body (generated by Workhorse))
optional 'file.name', type: String, desc: %q(real filename as send in Content-Disposition (generated by Workhorse))
optional 'file.type', type: String, desc: %q(real content type as send in Content-Type (generated by Workhorse))
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -49,7 +49,7 @@
# need to be added to the application settings. To prevent Rake tasks
# and other callers from failing, use any loaded settings and return
# defaults for missing columns.
- if ActiveRecord::Migrator.needs_migration?
+ if ActiveRecord::Base.connection.migration_context.needs_migration?
return fake_application_settings(current_settings&.attributes)
end
--- a/config/initializers/active_record_preloader.rb
+++ b/config/initializers/active_record_preloader.rb
@@ -1,15 +1,15 @@
@ -493,210 +266,3 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
+# end
+# end
+#end
--- /dev/null
+++ b/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb
@@ -0,0 +1,15 @@
+class ImportCommonMetricsNginxVts < ActiveRecord::Migration[4.2]
+ include Gitlab::Database::MigrationHelpers
+
+ require Rails.root.join('db/importers/common_metrics_importer.rb')
+
+ DOWNTIME = false
+
+ def up
+ Importers::CommonMetricsImporter.new.execute
+ end
+
+ def down
+ # no-op
+ end
+end
--- a/config/initializers/static_files.rb
+++ b/config/initializers/static_files.rb
@@ -1,26 +1,17 @@
app = Rails.application
-if (Gitlab.rails5? && app.config.public_file_server.enabled) || app.config.serve_static_files
+if app.config.public_file_server.enabled
# The `ActionDispatch::Static` middleware intercepts requests for static files
# by checking if they exist in the `/public` directory.
# We're replacing it with our `Gitlab::Middleware::Static` that does the same,
# except ignoring `/uploads`, letting those go through to the GitLab Rails app.
- if Gitlab.rails5?
- app.config.middleware.swap(
- ActionDispatch::Static,
- Gitlab::Middleware::Static,
- app.paths["public"].first,
- headers: app.config.public_file_server.headers
- )
- else
- app.config.middleware.swap(
- ActionDispatch::Static,
- Gitlab::Middleware::Static,
- app.paths["public"].first,
- app.config.static_cache_control
- )
- end
+ app.config.middleware.swap(
+ ActionDispatch::Static,
+ Gitlab::Middleware::Static,
+ app.paths["public"].first,
+ headers: app.config.public_file_server.headers
+ )
# If webpack-dev-server is configured, proxy webpack's public directory
# instead of looking for static assets
--- a/db/post_migrate/20181010133639_backfill_store_project_full_path_in_repo.rb
+++ b/db/post_migrate/20181010133639_backfill_store_project_full_path_in_repo.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class BackfillStoreProjectFullPathInRepo < ActiveRecord::Migration
+class BackfillStoreProjectFullPathInRepo < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181101191341_create_clusters_applications_cert_manager.rb
+++ b/db/migrate/20181101191341_create_clusters_applications_cert_manager.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class CreateClustersApplicationsCertManager < ActiveRecord::Migration
+class CreateClustersApplicationsCertManager < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181115140140_add_encrypted_runners_token_to_settings.rb
+++ b/db/migrate/20181115140140_add_encrypted_runners_token_to_settings.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class AddEncryptedRunnersTokenToSettings < ActiveRecord::Migration
+class AddEncryptedRunnersTokenToSettings < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181116050532_knative_external_ip.rb
+++ b/db/migrate/20181116050532_knative_external_ip.rb
@@ -3,7 +3,7 @@
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
-class KnativeExternalIp < ActiveRecord::Migration
+class KnativeExternalIp < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181108091549_cleanup_environments_external_url.rb
+++ b/db/migrate/20181108091549_cleanup_environments_external_url.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class CleanupEnvironmentsExternalUrl < ActiveRecord::Migration
+class CleanupEnvironmentsExternalUrl < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181116141415_add_encrypted_runners_token_to_namespaces.rb
+++ b/db/migrate/20181116141415_add_encrypted_runners_token_to_namespaces.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class AddEncryptedRunnersTokenToNamespaces < ActiveRecord::Migration
+class AddEncryptedRunnersTokenToNamespaces < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181116141504_add_encrypted_runners_token_to_projects.rb
+++ b/db/migrate/20181116141504_add_encrypted_runners_token_to_projects.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class AddEncryptedRunnersTokenToProjects < ActiveRecord::Migration
+class AddEncryptedRunnersTokenToProjects < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181119081539_add_merge_request_id_to_ci_pipelines.rb
+++ b/db/migrate/20181119081539_add_merge_request_id_to_ci_pipelines.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class AddMergeRequestIdToCiPipelines < ActiveRecord::Migration
+class AddMergeRequestIdToCiPipelines < ActiveRecord::Migration[4.2]
DOWNTIME = false
def up
--- a/db/migrate/20181120091639_add_foreign_key_to_ci_pipelines_merge_requests.rb
+++ b/db/migrate/20181120091639_add_foreign_key_to_ci_pipelines_merge_requests.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class AddForeignKeyToCiPipelinesMergeRequests < ActiveRecord::Migration
+class AddForeignKeyToCiPipelinesMergeRequests < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181120151656_add_token_encrypted_to_ci_runners.rb
+++ b/db/migrate/20181120151656_add_token_encrypted_to_ci_runners.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class AddTokenEncryptedToCiRunners < ActiveRecord::Migration
+class AddTokenEncryptedToCiRunners < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181121101842_add_ci_builds_partial_index_on_project_id_and_status.rb
+++ b/db/migrate/20181121101842_add_ci_builds_partial_index_on_project_id_and_status.rb
@@ -3,7 +3,7 @@
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
-class AddCiBuildsPartialIndexOnProjectIdAndStatus < ActiveRecord::Migration
+class AddCiBuildsPartialIndexOnProjectIdAndStatus < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181121101843_remove_redundant_ci_builds_partial_index.rb
+++ b/db/migrate/20181121101843_remove_redundant_ci_builds_partial_index.rb
@@ -3,7 +3,7 @@
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
-class RemoveRedundantCiBuildsPartialIndex < ActiveRecord::Migration
+class RemoveRedundantCiBuildsPartialIndex < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/migrate/20181123144235_create_suggestions.rb
+++ b/db/migrate/20181123144235_create_suggestions.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class CreateSuggestions < ActiveRecord::Migration
+class CreateSuggestions < ActiveRecord::Migration[4.2]
DOWNTIME = false
def change
--- a/db/post_migrate/20181026091631_migrate_forbidden_redirect_uris.rb
+++ b/db/post_migrate/20181026091631_migrate_forbidden_redirect_uris.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class MigrateForbiddenRedirectUris < ActiveRecord::Migration
+class MigrateForbiddenRedirectUris < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
--- a/db/post_migrate/20181121111200_schedule_runners_token_encryption.rb
+++ b/db/post_migrate/20181121111200_schedule_runners_token_encryption.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class ScheduleRunnersTokenEncryption < ActiveRecord::Migration
+class ScheduleRunnersTokenEncryption < ActiveRecord::Migration[4.2]
include Gitlab::Database::MigrationHelpers
DOWNTIME = false

2
debian/patches/series vendored
View file

@ -11,9 +11,7 @@
0430-remove-gitlab-markup.patch
0440-remove-puma.patch
0450-remove-bullet.patch
0460-relax-rspec-rails.patch
0470-relax-rails.patch
0480-relax-gitlab-sidekiq-fetcher.patch
0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch
0520-add-system-lib-path-for-webpack.patch