refresh patches
This commit is contained in:
parent
25682c191c
commit
4a90582846
11 changed files with 136 additions and 153 deletions
|
@ -1,9 +1,11 @@
|
|||
Debian package contains gitlab patches
|
||||
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13280
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -58,7 +58,7 @@
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -56,7 +56,7 @@ gem 'gitlab_git', '~> 10.6.8'
|
||||
# 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
|
||||
|
|
24
debian/patches/0018-loosen-rdoc.patch
vendored
24
debian/patches/0018-loosen-rdoc.patch
vendored
|
@ -1,13 +1,15 @@
|
|||
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -106,7 +106,7 @@
|
||||
gem 'github-markup', '~> 1.4'
|
||||
gem 'redcarpet', '~> 3.3.3'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
-gem 'rdoc', '~>3.6'
|
||||
+gem 'rdoc', '~> 4.1'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -104,7 +104,7 @@ gem 'deckar01-task_list', '1.0.5', requi
|
||||
gem 'gitlab-markup', '~> 1.5.0'
|
||||
gem 'redcarpet', '~> 3.3.3'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
-gem 'rdoc', '~>3.6'
|
||||
+gem 'rdoc', '~> 4.1'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
|
|
8
debian/patches/0042-relax-grape-entity.patch
vendored
8
debian/patches/0042-relax-grape-entity.patch
vendored
|
@ -1,8 +1,10 @@
|
|||
allow newer grape-entity already in debian
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -70,7 +70,7 @@
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', requi
|
||||
|
||||
# API
|
||||
gem 'grape', '~> 0.15.0'
|
||||
|
|
138
debian/patches/0050-relax-stable-libs.patch
vendored
138
debian/patches/0050-relax-stable-libs.patch
vendored
|
@ -1,24 +1,24 @@
|
|||
We should be able to update minor versions of stable libs without breaking
|
||||
gitlab Gemfile
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -1,18 +1,18 @@
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -1,16 +1,16 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
-gem 'rails', '4.2.7.1'
|
||||
-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
||||
+gem 'rails', '~> 4.2.7', '>= 4.2.7.1'
|
||||
+gem 'rails', '~> 4.2', '>= 4.2.7.1'
|
||||
+gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
|
||||
|
||||
# Responders respond_to and respond_with
|
||||
gem 'responders', '~> 2.0'
|
||||
|
||||
# Specify a sprockets version due to increased performance
|
||||
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
|
||||
-gem 'sprockets', '~> 3.6.0'
|
||||
+gem 'sprockets', '~> 3.6'
|
||||
gem 'sprockets-es6'
|
||||
-gem 'sprockets', '~> 3.7.0'
|
||||
+gem 'sprockets', '~> 3.7'
|
||||
gem 'sprockets-es6', '~> 0.9.2'
|
||||
|
||||
# Default values for AR models
|
||||
-gem 'default_value_for', '~> 3.0.0'
|
||||
|
@ -26,10 +26,10 @@ gitlab Gemfile
|
|||
|
||||
# Supported DBs
|
||||
gem 'mysql2', '~> 0.3.16', group: :mysql
|
||||
@@ -20,22 +20,22 @@
|
||||
@@ -18,22 +18,22 @@ gem 'pg', '~> 0.18.2', group: :postgres
|
||||
|
||||
# Authentication libraries
|
||||
gem 'devise', '~> 4.0'
|
||||
gem 'devise', '~> 4.2'
|
||||
-gem 'doorkeeper', '~> 4.2.0'
|
||||
-gem 'omniauth', '~> 1.3.1'
|
||||
-gem 'omniauth-auth0', '~> 1.4.1'
|
||||
|
@ -38,21 +38,22 @@ gitlab Gemfile
|
|||
+gem 'omniauth-auth0', '~> 1.4', '>= 1.4.1'
|
||||
gem 'omniauth-azure-oauth2', '~> 0.0.6'
|
||||
gem 'omniauth-bitbucket', '~> 0.0.2'
|
||||
gem 'omniauth-cas3', '~> 1.1.2'
|
||||
-gem 'omniauth-cas3', '~> 1.1.2'
|
||||
-gem 'omniauth-facebook', '~> 4.0.0'
|
||||
-gem 'omniauth-github', '~> 1.1.1'
|
||||
-gem 'omniauth-gitlab', '~> 1.0.0'
|
||||
+gem 'omniauth-cas3', '~> 1.1', '>= 1.1.2'
|
||||
+gem 'omniauth-facebook', '~> 4.0'
|
||||
+gem 'omniauth-github', '~> 1.1', '>= 1.1.1'
|
||||
+gem 'omniauth-gitlab', '~> 1.0'
|
||||
gem 'omniauth-google-oauth2', '~> 0.4.1'
|
||||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
||||
-gem 'omniauth-saml', '~> 1.6.0'
|
||||
-gem 'omniauth-saml', '~> 1.7.0'
|
||||
-gem 'omniauth-shibboleth', '~> 1.2.0'
|
||||
-gem 'omniauth-twitter', '~> 1.2.0'
|
||||
-gem 'omniauth_crowd', '~> 2.2.0'
|
||||
-gem 'rack-oauth2', '~> 1.2.1'
|
||||
+gem 'omniauth-saml', '~> 1.6'
|
||||
+gem 'omniauth-saml', '~> 1.7'
|
||||
+gem 'omniauth-shibboleth', '~> 1.2'
|
||||
+gem 'omniauth-twitter', '~> 1.2'
|
||||
+gem 'omniauth_crowd', '~> 2.2'
|
||||
|
@ -60,7 +61,7 @@ gitlab Gemfile
|
|||
gem 'jwt'
|
||||
|
||||
# Spam and anti-bot protection
|
||||
@@ -43,9 +43,9 @@
|
||||
@@ -41,9 +41,9 @@ gem 'recaptcha', '~> 3.0', require: 'rec
|
||||
gem 'akismet', '~> 2.0'
|
||||
|
||||
# Two-factor authentication
|
||||
|
@ -72,16 +73,22 @@ gitlab Gemfile
|
|||
gem 'u2f', '~> 0.2.1'
|
||||
|
||||
# Browser detection
|
||||
@@ -53,7 +53,7 @@
|
||||
@@ -51,12 +51,12 @@ gem 'browser', '~> 2.2'
|
||||
|
||||
# Extracting information from a git repository
|
||||
# Provide access to Gitlab::Git library
|
||||
-gem 'gitlab_git', '~> 10.6.6'
|
||||
+gem 'gitlab_git', '~> 10.6', '>= 10.6'
|
||||
-gem 'gitlab_git', '~> 10.6.8'
|
||||
+gem 'gitlab_git', '~> 10.6','>= 10.6.8'
|
||||
|
||||
# LDAP Auth
|
||||
# GitLab fork with several improvements to original library. For full list of changes
|
||||
@@ -66,7 +66,7 @@
|
||||
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
|
||||
-gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
|
||||
+gem 'omniauth-ldap', '~> 1.0', '>= 1.0.4', require: "omniauth-ldap"
|
||||
|
||||
# Git Wiki
|
||||
# Required manually in config/initializers/gollum.rb to control load order
|
||||
@@ -64,7 +64,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
|
||||
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
|
||||
|
||||
# Language detection
|
||||
|
@ -90,7 +97,7 @@ gitlab Gemfile
|
|||
|
||||
# API
|
||||
gem 'grape', '~> 0.15.0'
|
||||
@@ -77,7 +77,7 @@
|
||||
@@ -75,7 +75,7 @@ gem 'rack-cors', '~> 0.4.0', require:
|
||||
gem 'kaminari', '~> 0.17.0'
|
||||
|
||||
# HAML
|
||||
|
@ -99,7 +106,7 @@ gitlab Gemfile
|
|||
|
||||
# Files attachments
|
||||
gem 'carrierwave', '~> 0.10.0'
|
||||
@@ -98,79 +98,79 @@
|
||||
@@ -96,39 +96,39 @@ gem 'fog-rackspace', '~> 0.1.1'
|
||||
gem 'unf', '~> 0.1.4'
|
||||
|
||||
# Seed data
|
||||
|
@ -107,22 +114,25 @@ gitlab Gemfile
|
|||
+gem 'seed-fu', '~> 2.3', '>= 2.3.5'
|
||||
|
||||
# Markdown and HTML processing
|
||||
-gem 'html-pipeline', '~> 1.11.0'
|
||||
-gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
|
||||
+gem 'html-pipeline', '~> 1.11'
|
||||
+gem 'task_list', '~> 1.0', '>= 1.0.2', require: 'task_list/railtie'
|
||||
gem 'github-markup', '~> 1.4'
|
||||
-gem 'redcarpet', '~> 3.3.3'
|
||||
-gem 'RedCloth', '~> 4.3.2'
|
||||
+gem 'redcarpet', '~> 3.3', '>= 3.3.3'
|
||||
+gem 'RedCloth', '~> 4.3', '>= 4.3.1'
|
||||
gem 'rdoc', '~> 4.1'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
-gem 'asciidoctor', '~> 1.5.2'
|
||||
+gem 'asciidoctor', '~> 1.5', '>= 1.5.2'
|
||||
gem 'rouge', '~> 2.0'
|
||||
-gem 'html-pipeline', '~> 1.11.0'
|
||||
-gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
|
||||
-gem 'gitlab-markup', '~> 1.5.0'
|
||||
-gem 'redcarpet', '~> 3.3.3'
|
||||
-gem 'RedCloth', '~> 4.3.2'
|
||||
+gem 'html-pipeline', '~> 1.11'
|
||||
+gem 'deckar01-task_list', '~> 1.0', '>= 1.0.5', require: 'task_list/railtie'
|
||||
+gem 'gitlab-markup', '~> 1.5'
|
||||
+gem 'redcarpet', '~> 3.3', '>= 3.3.3'
|
||||
+gem 'RedCloth', '~> 4.3', '>= 4.3.2'
|
||||
gem 'rdoc', '~> 4.1'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
-gem 'wikicloth', '0.8.1'
|
||||
-gem 'asciidoctor', '~> 1.5.2'
|
||||
+gem 'wikicloth', '~> 0.8.1'
|
||||
+gem 'asciidoctor', '~> 1.5', '>= 1.5.2'
|
||||
gem 'rouge', '~> 2.0'
|
||||
gem 'truncato', '~> 0.7.8'
|
||||
|
||||
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
|
||||
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
|
||||
|
@ -135,9 +145,9 @@ gitlab Gemfile
|
|||
|
||||
# Application server
|
||||
group :unicorn do
|
||||
- gem 'unicorn', '~> 4.9.0'
|
||||
+ gem 'unicorn', '>= 4.9'
|
||||
gem 'unicorn-worker-killer', '~> 0.4.2'
|
||||
- gem 'unicorn', '~> 5.1.0'
|
||||
+ gem 'unicorn', '~> 5.1'
|
||||
gem 'unicorn-worker-killer', '~> 0.4.4'
|
||||
end
|
||||
|
||||
# State machine
|
||||
|
@ -147,12 +157,10 @@ gitlab Gemfile
|
|||
+gem 'after_commit_queue', '~> 1.3'
|
||||
|
||||
# Issue tags
|
||||
gem 'acts-as-taggable-on', '~> 3.4'
|
||||
|
||||
gem 'acts-as-taggable-on', '~> 4.0'
|
||||
@@ -136,39 +136,39 @@ gem 'acts-as-taggable-on', '~> 4.0'
|
||||
# Background jobs
|
||||
-gem 'sinatra', '~> 1.4.4', require: false
|
||||
+gem 'sinatra', '~> 1.4', '>= 1.4.4', require: false
|
||||
gem 'sidekiq', '~> 4.0'
|
||||
gem 'sidekiq', '~> 4.2'
|
||||
gem 'sidekiq-cron', '~> 0.4.0'
|
||||
-gem 'redis-namespace', '~> 1.5.2'
|
||||
+gem 'redis-namespace', '~> 1.5', '>= 1.5.2'
|
||||
|
@ -198,7 +206,7 @@ gitlab Gemfile
|
|||
|
||||
# Asana integration
|
||||
gem 'asana', '~> 0.4.0'
|
||||
@@ -179,29 +179,29 @@
|
||||
@@ -177,64 +177,64 @@ gem 'asana', '~> 0.4.0'
|
||||
gem 'ruby-fogbugz', '~> 0.2.1'
|
||||
|
||||
# d3
|
||||
|
@ -236,11 +244,16 @@ gitlab Gemfile
|
|||
|
||||
# Detect and convert string character encoding
|
||||
gem 'charlock_holmes', '~> 0.7.3'
|
||||
@@ -213,30 +213,30 @@
|
||||
|
||||
# Faster JSON
|
||||
-gem 'oj', '~> 2.17.4'
|
||||
+gem 'oj', '~> 2.17', '>= 2.17.4'
|
||||
|
||||
# Parse time & duration
|
||||
gem 'chronic', '~> 0.10.2'
|
||||
gem 'chronic_duration', '~> 0.10.6'
|
||||
|
||||
-gem 'sass-rails', '~> 5.0.0'
|
||||
-gem 'sass-rails', '~> 5.0.6'
|
||||
-gem 'coffee-rails', '~> 4.1.0'
|
||||
-gem 'uglifier', '~> 2.7.2'
|
||||
-gem 'turbolinks', '~> 2.5.0'
|
||||
|
@ -249,7 +262,7 @@ gitlab Gemfile
|
|||
-gem 'addressable', '~> 2.3.8'
|
||||
-gem 'bootstrap-sass', '~> 3.3.0'
|
||||
-gem 'font-awesome-rails', '~> 4.6.1'
|
||||
+gem 'sass-rails', '~> 5.0'
|
||||
+gem 'sass-rails', '~> 5.0', '>= 5.0.6'
|
||||
+gem 'coffee-rails', '~> 4.1'
|
||||
+gem 'uglifier', '~> 2.7', '>= 2.7.2'
|
||||
+gem 'turbolinks', '~> 2.5'
|
||||
|
@ -263,40 +276,39 @@ gitlab Gemfile
|
|||
-gem 'jquery-atwho-rails', '~> 1.3.2'
|
||||
-gem 'jquery-rails', '~> 4.1.0'
|
||||
-gem 'jquery-ui-rails', '~> 5.0.0'
|
||||
-gem 'request_store', '~> 1.3.0'
|
||||
+gem 'gon', '~> 6.1'
|
||||
+gem 'jquery-atwho-rails', '~> 1.3' '>= 1.3.2'
|
||||
+gem 'jquery-rails', '~> 4.1'
|
||||
+gem 'jquery-ui-rails', '~> 5.0'
|
||||
gem 'request_store', '~> 1.3'
|
||||
-gem 'select2-rails', '~> 3.5.9'
|
||||
-gem 'virtus', '~> 1.0.1'
|
||||
-gem 'net-ssh', '~> 3.0.1'
|
||||
+gem 'gon', '~> 6.1'
|
||||
+gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
|
||||
+gem 'jquery-rails', '~> 4.0'
|
||||
+gem 'jquery-ui-rails', '~> 5.0'
|
||||
+gem 'request_store', '~> 1.3'
|
||||
+gem 'select2-rails', '~> 3.5', '>= 3.5.9'
|
||||
+gem 'virtus', '~> 1.0', '>= 1.0.1'
|
||||
+gem 'net-ssh', '~> 3.0', '>= 3.0.1'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
# Sentry integration
|
||||
-gem 'sentry-raven', '~> 1.1.0'
|
||||
+gem 'sentry-raven', '~> 1.1'
|
||||
-gem 'sentry-raven', '~> 2.0.0'
|
||||
+gem 'sentry-raven', '~> 2.0'
|
||||
|
||||
-gem 'premailer-rails', '~> 1.9.0'
|
||||
+gem 'premailer-rails', '~> 1.9'
|
||||
|
||||
# Metrics
|
||||
group :metrics do
|
||||
@@ -329,7 +329,7 @@
|
||||
@@ -324,7 +324,7 @@ end
|
||||
|
||||
gem 'newrelic_rpm', '~> 3.16'
|
||||
|
||||
-gem 'octokit', '~> 4.3.0'
|
||||
+gem 'octokit', '~> 4.3'
|
||||
|
||||
gem 'mail_room', '~> 0.8'
|
||||
gem 'mail_room', '~> 0.8.1'
|
||||
|
||||
@@ -338,18 +338,18 @@
|
||||
gem 'ruby-prof', '~> 0.15.9'
|
||||
@@ -333,18 +333,18 @@ gem 'email_reply_parser', '~> 0.5.8'
|
||||
gem 'ruby-prof', '~> 0.16.2'
|
||||
|
||||
## CI
|
||||
-gem 'activerecord-session_store', '~> 1.0.0'
|
||||
|
@ -311,8 +323,8 @@ gitlab Gemfile
|
|||
gem 'paranoia', '~> 2.0'
|
||||
|
||||
# Health check
|
||||
-gem 'health_check', '~> 2.1.0'
|
||||
+gem 'health_check', '~> 2.1'
|
||||
-gem 'health_check', '~> 2.2.0'
|
||||
+gem 'health_check', '~> 2.2'
|
||||
|
||||
# System information
|
||||
gem 'vmstat', '~> 2.2'
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
Bundler will fail when it can't find these locally
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -245,90 +245,32 @@
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -243,87 +243,34 @@ group :metrics do
|
||||
gem 'influxdb', '~> 0.2', require: false
|
||||
end
|
||||
|
||||
|
@ -19,7 +21,12 @@ Bundler will fail when it can't find these locally
|
|||
- # Better errors handler
|
||||
- gem 'better_errors', '~> 1.0.1'
|
||||
- gem 'binding_of_caller', '~> 0.7.2'
|
||||
-
|
||||
+#group :development, :test do
|
||||
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
|
||||
+ gem 'database_cleaner', '~> 1.5'
|
||||
+ gem 'factory_girl_rails', '~> 4.6'
|
||||
+ gem 'rspec-rails', '~> 3.4'
|
||||
|
||||
- # Docs generator
|
||||
- gem 'sdoc', '~> 0.3.20'
|
||||
-
|
||||
|
@ -37,14 +44,11 @@ Bundler will fail when it can't find these locally
|
|||
- gem 'database_cleaner', '~> 1.5.0'
|
||||
- gem 'factory_girl_rails', '~> 4.6.0'
|
||||
- gem 'rspec-rails', '~> 3.5.0'
|
||||
+#group :development, :test do
|
||||
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
|
||||
+ gem 'database_cleaner', '~> 1.5'
|
||||
+ gem 'factory_girl_rails', '~> 4.6'
|
||||
+ gem 'rspec-rails', '~> 3.4'
|
||||
gem 'rspec-retry', '~> 0.4.5'
|
||||
- gem 'rspec-retry', '~> 0.4.5'
|
||||
- gem 'spinach-rails', '~> 0.2.1'
|
||||
- gem 'spinach-rerun-reporter', '~> 0.0.2'
|
||||
+ gem 'awesome_print', '~> 1.2', require: false
|
||||
+ gem 'fuubar', '~> 2.0'
|
||||
|
||||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
||||
- gem 'minitest', '~> 5.7.0'
|
||||
|
@ -65,12 +69,11 @@ Bundler will fail when it can't find these locally
|
|||
- gem 'spring-commands-spinach', '~> 1.1.0'
|
||||
- gem 'spring-commands-teaspoon', '~> 0.0.2'
|
||||
-
|
||||
- gem 'rubocop', '~> 0.42.0', require: false
|
||||
- gem 'rubocop', '~> 0.43.0', require: false
|
||||
- gem 'rubocop-rspec', '~> 1.5.0', require: false
|
||||
- gem 'scss_lint', '~> 0.47.0', require: false
|
||||
- gem 'haml_lint', '~> 0.18.2', require: false
|
||||
- gem 'simplecov', '0.12.0', require: false
|
||||
- gem 'flog', '~> 4.3.2', require: false
|
||||
- gem 'flay', '~> 2.6.1', require: false
|
||||
- gem 'bundler-audit', '~> 0.5.0', require: false
|
||||
-
|
||||
|
@ -79,6 +82,8 @@ Bundler will fail when it can't find these locally
|
|||
|
||||
- gem 'license_finder', '~> 2.1.0', require: false
|
||||
- gem 'knapsack', '~> 1.11.0'
|
||||
-
|
||||
- gem 'activerecord_sane_schema_dumper', '0.2'
|
||||
-end
|
||||
-
|
||||
-group :test do
|
||||
|
@ -101,12 +106,8 @@ Bundler will fail when it can't find these locally
|
|||
gem 'timecop', '~> 0.8.0'
|
||||
end
|
||||
|
||||
-group :production do
|
||||
- gem 'gitlab_meta', '7.0'
|
||||
-end
|
||||
-
|
||||
-gem 'newrelic_rpm', '~> 3.16'
|
||||
-
|
||||
gem 'octokit', '~> 4.3'
|
||||
|
||||
gem 'mail_room', '~> 0.8'
|
||||
gem 'mail_room', '~> 0.8.1'
|
||||
|
|
10
debian/patches/0108-make-mysql-optional.patch
vendored
10
debian/patches/0108-make-mysql-optional.patch
vendored
|
@ -7,9 +7,11 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
|
|||
Gemfile | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -15,8 +15,9 @@
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -13,8 +13,9 @@ gem 'sprockets-es6', '~> 0.9.2'
|
||||
gem 'default_value_for', '~> 3.0'
|
||||
|
||||
# Supported DBs
|
||||
|
@ -20,4 +22,4 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
|
|||
+gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
|
||||
|
||||
# Authentication libraries
|
||||
gem 'devise', '~> 4.0'
|
||||
gem 'devise', '~> 4.2'
|
||||
|
|
8
debian/patches/052-relax-grape.patch
vendored
8
debian/patches/052-relax-grape.patch
vendored
|
@ -1,8 +1,10 @@
|
|||
https://gitlab.com/gitlab-org/gitlab-ce/issues/19670
|
||||
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -70,7 +70,7 @@
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -68,7 +68,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.2',
|
||||
gem 'github-linguist', '~> 4.7', require: 'linguist'
|
||||
|
||||
# API
|
||||
|
|
12
debian/patches/053-relax-omniauth-facebook.patch
vendored
12
debian/patches/053-relax-omniauth-facebook.patch
vendored
|
@ -1,11 +1,13 @@
|
|||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -27,7 +27,7 @@
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
@@ -25,7 +25,7 @@ gem 'omniauth-auth0', '~> 1.4',
|
||||
gem 'omniauth-azure-oauth2', '~> 0.0.6'
|
||||
gem 'omniauth-bitbucket', '~> 0.0.2'
|
||||
gem 'omniauth-cas3', '~> 1.1.2'
|
||||
gem 'omniauth-cas3', '~> 1.1', '>= 1.1.2'
|
||||
-gem 'omniauth-facebook', '~> 4.0'
|
||||
+gem 'omniauth-facebook', '>= 3.0', '< 5.0'
|
||||
+gem 'omniauth-facebook', '>= 3.0', '<< 5.0'
|
||||
gem 'omniauth-github', '~> 1.1', '>= 1.1.1'
|
||||
gem 'omniauth-gitlab', '~> 1.0'
|
||||
gem 'omniauth-google-oauth2', '~> 0.4.1'
|
||||
|
|
4
debian/patches/pid-log-paths.patch
vendored
4
debian/patches/pid-log-paths.patch
vendored
|
@ -4,8 +4,8 @@ Index: gitlab/bin/background_jobs
|
|||
===================================================================
|
||||
--- gitlab.orig/bin/background_jobs
|
||||
+++ gitlab/bin/background_jobs
|
||||
@@ -6,6 +6,11 @@ sidekiq_pidfile="$app_root/tmp/pids/side
|
||||
sidekiq_logfile="$app_root/log/sidekiq.log"
|
||||
@@ -7,6 +7,11 @@ sidekiq_logfile="$app_root/log/sidekiq.l
|
||||
sidekiq_config="$app_root/config/sidekiq_queues.yml"
|
||||
gitlab_user=$(ls -l config.ru | awk '{print $3}')
|
||||
|
||||
+# Read configuration variable file if it is present
|
||||
|
|
41
debian/patches/runners.patch
vendored
41
debian/patches/runners.patch
vendored
|
@ -1,41 +0,0 @@
|
|||
Last-Update: 2016-08-08
|
||||
Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5701
|
||||
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819903
|
||||
Author: Libor Klepáč <libor.klepac@bcom.cz>
|
||||
Reviewed-By: Dmitry Smirnov <onlyjob@debian.org>
|
||||
Description: fix error 500 on runners page.
|
||||
"ActionView::Template::Error (Missing partial kaminari/_paginator"
|
||||
|
||||
Index: gitlab/app/views/admin/runners/index.html.haml
|
||||
===================================================================
|
||||
--- gitlab.orig/app/views/admin/runners/index.html.haml
|
||||
+++ gitlab/app/views/admin/runners/index.html.haml
|
||||
@@ -73,4 +73,4 @@
|
||||
|
||||
- @runners.each do |runner|
|
||||
= render "admin/runners/runner", runner: runner
|
||||
- = paginate @runners
|
||||
+ = paginate @runners, theme: "gitlab"
|
||||
Index: gitlab/app/views/admin/runners/show.html.haml
|
||||
===================================================================
|
||||
--- gitlab.orig/app/views/admin/runners/show.html.haml
|
||||
+++ gitlab/app/views/admin/runners/show.html.haml
|
||||
@@ -67,7 +67,7 @@
|
||||
= form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
|
||||
= f.hidden_field :runner_id, value: @runner.id
|
||||
= f.submit 'Enable', class: 'btn btn-xs'
|
||||
- = paginate @projects
|
||||
+ = paginate @projects, theme: "gitlab"
|
||||
|
||||
.col-md-6
|
||||
%h4 Recent builds served by this runner
|
||||
Index: gitlab/app/views/projects/runners/_specific_runners.html.haml
|
||||
===================================================================
|
||||
--- gitlab.orig/app/views/projects/runners/_specific_runners.html.haml
|
||||
+++ gitlab/app/views/projects/runners/_specific_runners.html.haml
|
||||
@@ -26,4 +26,4 @@
|
||||
%h4.underlined-title Available specific runners
|
||||
%ul.bordered-list.available-specific-runners
|
||||
= render partial: 'runner', collection: @assignable_runners, as: :runner
|
||||
- = paginate @assignable_runners
|
||||
+ = paginate @assignable_runners, theme: "gitlab"
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -6,7 +6,6 @@
|
|||
0108-make-mysql-optional.patch
|
||||
source-init-functions.patch
|
||||
pid-log-paths.patch
|
||||
runners.patch
|
||||
0200-use-jquery-for-jquery2.patch
|
||||
052-relax-grape.patch
|
||||
053-relax-omniauth-facebook.patch
|
||||
|
|
Loading…
Reference in a new issue