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-08-24 20:52:28 +05:30
parent bcc36f76b2
commit c1cba611d9
12 changed files with 145 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -1,6 +1,7 @@
gitlab (8.10.5+dfsg-1) UNRELEASED; urgency=medium
* New upstream release
* Refresh patches
-- Pirate Praveen <praveen@debian.org> Wed, 24 Aug 2016 12:52:19 +0530

4
debian/patches/0005-use-debian-omniauth-ldap.patch vendored
View file

@ -5,11 +5,11 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -57,7 +57,7 @@ gem "gitlab_git", '~> 10.0'
@@ -57,7 +57,7 @@ gem 'gitlab_git', '~> 10.3.2'
# 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
-gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
-gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap'
+gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
# Git Wiki

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

@ -4,10 +4,10 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -107,7 +107,7 @@ gem 'task_list', '~> 1.0.2', require
gem 'github-markup', '~> 1.3.1'
@@ -108,7 +108,7 @@ gem 'task_list', '~> 1.0.2', require
gem 'github-markup', '~> 1.4'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.2.9'
gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~>3.6'
+gem 'rdoc', '~> 4.1'
gem 'org-ruby', '~> 0.9.12'

2
debian/patches/003-loosen-sprockets.patch vendored
View file

@ -12,4 +12,4 @@ Index: gitlab/Gemfile
+gem 'sprockets', '~> 3.3'
# Default values for AR models
gem "default_value_for", "~> 3.0.0"
gem 'default_value_for', '~> 3.0.0'

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

@ -1,31 +1,31 @@
We should be able to update minor versions of stable libs without breaking
gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.6'
-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+gem 'rails', '~> 4.2.6'
+gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
-gem 'rails', '4.2.7'
+gem 'rails', '~> 4.2.7'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with
gem 'responders', '~> 2.0'
@@ -11,7 +11,7 @@
@@ -11,7 +11,7 @@ gem 'responders', '~> 2.0'
gem 'sprockets', '~> 3.3'
# Default values for AR models
-gem "default_value_for", "~> 3.0.0"
+gem "default_value_for", "~> 3.0"
-gem 'default_value_for', '~> 3.0.0'
+gem 'default_value_for', '~> 3.0'
# Supported DBs
gem "mysql2", '~> 0.3.16', group: :mysql
@@ -20,21 +20,21 @@
gem 'mysql2', '~> 0.3.16', group: :mysql
@@ -20,21 +20,21 @@ gem 'pg', '~> 0.18.2', group: :postgres
# Authentication libraries
gem 'devise', '~> 4.0'
gem 'doorkeeper', '~> 3.1'
gem 'doorkeeper', '~> 4.0'
-gem 'omniauth', '~> 1.3.1'
-gem 'omniauth-auth0', '~> 1.4.1'
+gem 'omniauth', '~> 1.3', '>= 1.3.1'
@ -40,14 +40,14 @@ gitlab Gemfile
+gem 'omniauth-facebook', '~> 3.0'
+gem 'omniauth-github', '~> 1.1', '>= 1.1.1'
+gem 'omniauth-gitlab', '~> 1.0'
gem 'omniauth-google-oauth2', '~> 0.2.0'
gem 'omniauth-google-oauth2', '~> 0.4.1'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
-gem 'omniauth-saml', '~> 1.5.0'
-gem 'omniauth-saml', '~> 1.6.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.5'
+gem 'omniauth-saml', '~> 1.6'
+gem 'omniauth-shibboleth', '~> 1.2'
+gem 'omniauth-twitter', '~> 1.2'
+gem 'omniauth_crowd', '~> 2.2'
@ -55,7 +55,7 @@ gitlab Gemfile
gem 'jwt'
# Spam and anti-bot protection
@@ -42,9 +42,9 @@
@@ -42,9 +42,9 @@ gem 'recaptcha', '~> 3.0', require: 'rec
gem 'akismet', '~> 2.0'
# Two-factor authentication
@ -67,45 +67,39 @@ gitlab Gemfile
gem 'u2f', '~> 0.2.1'
# Browser detection
@@ -61,11 +61,11 @@
# Git Wiki
# Required manually in config/initializers/gollum.rb to control load order
-gem 'gollum-lib', '~> 4.1.0', require: false
+gem 'gollum-lib', '~> 4.2', require: false
@@ -65,7 +65,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
# Language detection
-gem "github-linguist", "~> 4.7.0", require: "linguist"
+gem "github-linguist", "~> 4.7", require: "linguist"
-gem 'github-linguist', '~> 4.7.0', require: 'linguist'
+gem 'github-linguist', '~> 4.7', require: 'linguist'
# API
gem 'grape', '~> 0.13.0'
@@ -99,31 +99,31 @@
gem "six", '~> 0.2.0'
@@ -100,73 +100,73 @@ gem 'unf', '~> 0.1.4'
gem 'six', '~> 0.2.0'
# Seed data
-gem "seed-fu", '~> 2.3.5'
+gem "seed-fu", '~> 2.3'
-gem 'seed-fu', '~> 2.3.5'
+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 'github-markup', '~> 1.3.1'
-gem 'redcarpet', '~> 3.3.3'
-gem 'RedCloth', '~> 4.2.9'
+gem 'html-pipeline', '~> 1.11'
+gem 'task_list', '~> 1.0', '>= 1.0.2', require: 'task_list/railtie'
+gem 'github-markup', '~> 1.3', '>= 1.3.1'
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.2', '>= 4.2.9'
+gem 'RedCloth', '~> 4.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 'asciidoctor', '~> 1.5', '>= 1.5.2'
gem 'rouge', '~> 1.11'
gem 'rouge', '~> 2.0'
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
@ -118,22 +112,34 @@ gitlab Gemfile
# Application server
group :unicorn do
- gem "unicorn", '~> 4.9.0'
+ gem "unicorn", '~> 5.0'
- gem 'unicorn', '~> 4.9.0'
+ gem 'unicorn', '>= 4.9.0'
gem 'unicorn-worker-killer', '~> 0.4.2'
end
@@ -136,7 +136,7 @@
# State machine
gem 'state_machines-activerecord', '~> 0.4.0'
# Run events after state machine commits
-gem 'after_commit_queue', '~> 1.3.0'
+gem 'after_commit_queue', '~> 1.3'
# Issue tags
gem 'acts-as-taggable-on', '~> 3.4'
# Background jobs
-gem 'sinatra', '~> 1.4.4', require: nil
+gem 'sinatra', '~> 1.4', '>= 1.4.4', require: nil
-gem 'sinatra', '~> 1.4.4', require: false
+gem 'sinatra', '~> 1.4', '>= 1.4.4', require: false
gem 'sidekiq', '~> 4.0'
gem 'sidekiq-cron', '~> 0.4.0'
gem 'redis-namespace'
@@ -148,33 +148,33 @@
gem "rainbow", '~> 2.1.0'
-gem 'redis-namespace', '~> 1.5.2'
+gem 'redis-namespace', '~> 1.5', '>= 1.5.2'
# HTTP requests
gem 'httparty', '~> 0.13.3'
# Colored output to console
-gem 'rainbow', '~> 2.1.0'
+gem 'rainbow', '~> 2.1'
# GitLab settings
-gem 'settingslogic', '~> 2.0.9'
@ -145,8 +151,8 @@ gitlab Gemfile
+gem 'version_sorter', '~> 2.0'
# Cache
-gem "redis-rails", '~> 4.0.0'
+gem "redis-rails", '~> 4.0'
-gem 'redis-rails', '~> 4.0.0'
+gem 'redis-rails', '~> 4.0'
# Redis
gem 'redis', '~> 3.2'
@ -161,19 +167,17 @@ gitlab Gemfile
+gem 'hipchat', '~> 1.5'
# Flowdock integration
-gem "gitlab-flowdock-git-hook", "~> 1.0.1"
+gem "gitlab-flowdock-git-hook", "~> 1.0", ">= 1.0.1"
# Gemnasium integration
gem "gemnasium-gitlab-service", "~> 0.2"
gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
@@ -175,7 +175,7 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.
gem 'gemnasium-gitlab-service', '~> 0.2'
# Slack integration
-gem "slack-notifier", "~> 1.2.0"
+gem "slack-notifier", "~> 1.2"
-gem 'slack-notifier', '~> 1.2.0'
+gem 'slack-notifier', '~> 1.2'
# Asana integration
gem 'asana', '~> 0.4.0'
@@ -183,29 +183,29 @@
@@ -184,29 +184,29 @@ gem 'asana', '~> 0.4.0'
gem 'ruby-fogbugz', '~> 0.2.1'
# d3
@ -181,25 +185,25 @@ gitlab Gemfile
+gem 'd3_rails', '~> 3.5'
# underscore-rails
-gem "underscore-rails", "~> 1.8.0"
+gem "underscore-rails", "~> 1.8"
-gem 'underscore-rails', '~> 1.8.0'
+gem 'underscore-rails', '~> 1.8'
# Sanitize user input
gem "sanitize", '~> 2.0'
gem 'sanitize', '~> 2.0'
-gem 'babosa', '~> 1.0.2'
+gem 'babosa', '~> 1.0', '>= 1.0.2'
# Sanitizes SVG input
-gem "loofah", "~> 2.0.3"
+gem "loofah", "~> 2.0", ">= 2.0.3"
-gem 'loofah', '~> 2.0.3'
+gem 'loofah', '~> 2.0', '>= 2.0.3'
# Working with license
-gem 'licensee', '~> 8.0.0'
+gem 'licensee', '~> 8.0'
# Protect against bruteforcing
-gem "rack-attack", '~> 4.3.1'
+gem "rack-attack", '~> 4.3', '>= 4.3.1'
-gem 'rack-attack', '~> 4.3.1'
+gem 'rack-attack', '~> 4.3', '>= 4.3.1'
# Ace editor
-gem 'ace-rails-ap', '~> 4.0.2'
@ -207,33 +211,33 @@ gitlab Gemfile
# Keyboard shortcuts
-gem 'mousetrap-rails', '~> 1.4.6'
+gem 'mousetrap-rails', '~> 1.4', '1.4.6'
+gem 'mousetrap-rails', '~> 1.4', '>= 1.4.6'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.3'
@@ -213,30 +213,30 @@
@@ -214,30 +214,30 @@ gem 'charlock_holmes', '~> 0.7.3'
# Parse duration
gem 'chronic_duration', '~> 0.10.6'
-gem "sass-rails", '~> 5.0.0'
-gem "coffee-rails", '~> 4.1.0'
-gem "uglifier", '~> 2.7.2'
-gem 'sass-rails', '~> 5.0.0'
-gem 'coffee-rails', '~> 4.1.0'
-gem 'uglifier', '~> 2.7.2'
-gem 'turbolinks', '~> 2.5.0'
-gem 'jquery-turbolinks', '~> 2.1.0'
-
-gem 'addressable', '~> 2.3.8'
-gem 'bootstrap-sass', '~> 3.3.0'
-gem 'font-awesome-rails', '~> 4.6.1'
+gem "sass-rails", '~> 5.0'
+gem "coffee-rails", '~> 4.1'
+gem "uglifier", '~> 2.7', '>= 2.7.2'
+gem 'sass-rails', '~> 5.0'
+gem 'coffee-rails', '~> 4.1'
+gem 'uglifier', '~> 2.7', '>= 2.7.2'
+gem 'turbolinks', '~> 2.5'
+gem 'jquery-turbolinks', '~> 2.1'
+
+gem 'addressable', '~> 2.3', '>= 2.3.8'
+gem 'bootstrap-sass', '~> 3.3'
+gem 'font-awesome-rails', '~> 4.6', '>= 4.6.1'
gem 'gitlab_emoji', '~> 0.3.0'
gem 'gemojione', '~> 3.0'
-gem 'gon', '~> 6.0.1'
-gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails', '~> 4.1.0'
@ -244,7 +248,7 @@ gitlab Gemfile
-gem 'net-ssh', '~> 3.0.1'
+gem 'gon', '~> 6.0', '>= 6.0.1'
+gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
+gem 'jquery-rails', '~> 4.0'
+gem 'jquery-rails', '~> 4.1'
+gem 'jquery-ui-rails', '~> 5.0'
+gem 'request_store', '~> 1.3'
+gem 'select2-rails', '~> 3.5', '>= 3.5.9'
@ -253,32 +257,43 @@ gitlab Gemfile
gem 'base32', '~> 0.3.0'
# Sentry integration
gem 'sentry-raven', '~> 0.15'
-gem 'sentry-raven', '~> 1.1.0'
+gem 'sentry-raven', '~> 1.1'
-gem 'premailer-rails', '~> 1.9.0'
+gem 'premailer-rails', '~> 1.9'
# Metrics
group :metrics do
@@ -328,7 +328,7 @@
@@ -327,25 +327,25 @@ end
gem "newrelic_rpm", '~> 3.14'
gem 'newrelic_rpm', '~> 3.14'
-gem 'octokit', '~> 4.3.0'
+gem 'octokit', '~> 4.3'
gem "mail_room", "~> 0.8"
gem 'mail_room', '~> 0.8'
@@ -339,10 +339,10 @@
gem "nested_form", '~> 0.3.2'
gem 'email_reply_parser', '~> 0.5.8'
## CI
-gem 'activerecord-session_store', '~> 1.0.0'
+gem 'activerecord-session_store', '~> 1.0'
gem 'nested_form', '~> 0.3.2'
# OAuth
-gem 'oauth2', '~> 1.0.0'
+gem 'oauth2', '~> 1.0'
-gem 'oauth2', '~> 1.2.0'
+gem 'oauth2', '~> 1.2'
# Soft deletion
gem "paranoia", "~> 2.0"
gem 'paranoia', '~> 2.0'
# Health check
-gem 'health_check', '~> 1.5.1'
+gem 'health_check', '~> 1.5', '>= 1.5.1'
-gem 'health_check', '~> 2.1.0'
+gem 'health_check', '~> 2.1'
# System information
-gem 'vmstat', '~> 2.1.1'
-gem 'sys-filesystem', '~> 1.1.6'
+gem 'vmstat', '~> 2.1', '>= 2.1.1'
+gem 'sys-filesystem', '~> 1.1', '>= 1.1.6'

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

@ -4,19 +4,18 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -245,89 +245,6 @@ group :metrics do
@@ -246,87 +246,6 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
end
-group :development do
- gem "foreman"
- gem 'foreman', '~> 0.78.0'
- gem 'brakeman', '~> 3.3.0', require: false
-
- gem 'letter_opener_web', '~> 1.3.0'
- gem 'quiet_assets', '~> 1.0.2'
- gem 'rerun', '~> 0.11.0'
- gem 'bullet', require: false
- gem 'rblineprof', platform: :mri, require: false
- gem 'bullet', '~> 5.0.0', require: false
- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
- gem 'web-console', '~> 2.0'
-
- # Better errors handler
@ -24,23 +23,23 @@ Index: gitlab/Gemfile
- gem 'binding_of_caller', '~> 0.7.2'
-
- # Docs generator
- gem "sdoc", '~> 0.3.20'
- gem 'sdoc', '~> 0.3.20'
-
- # thin instead webrick
- gem 'thin', '~> 1.6.1'
- gem 'thin', '~> 1.7.0'
-end
-
-group :development, :test do
- gem 'byebug', platform: :mri
- gem 'pry-rails'
- gem 'byebug', '~> 8.2.1', platform: :mri
- gem 'pry-rails', '~> 0.3.4'
-
- gem 'awesome_print', '~> 1.2.0', require: false
- gem 'fuubar', '~> 2.0.0'
-
- gem 'database_cleaner', '~> 1.4.0'
- gem 'factory_girl_rails', '~> 4.6.0'
- gem 'rspec-rails', '~> 3.4.0'
- gem 'rspec-retry'
- gem 'rspec-rails', '~> 3.5.0'
- gem 'rspec-retry', '~> 0.4.5'
- gem 'spinach-rails', '~> 0.2.1'
- gem 'spinach-rerun-reporter', '~> 0.0.2'
-
@ -62,19 +61,18 @@ Index: gitlab/Gemfile
- gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'spring-commands-teaspoon', '~> 0.0.2'
-
- gem 'rubocop', '~> 0.40.0', require: false
- gem 'rubocop', '~> 0.41.2', require: false
- gem 'rubocop-rspec', '~> 1.5.0', require: false
- gem 'scss_lint', '~> 0.47.0', require: false
- gem 'coveralls', '~> 0.8.2', require: false
- gem 'simplecov', '~> 0.11.0', require: false
- gem 'flog', require: false
- gem 'flay', require: false
- gem 'bundler-audit', require: false
- gem 'flog', '~> 4.3.2', require: false
- gem 'flay', '~> 2.6.1', require: false
- gem 'bundler-audit', '~> 0.5.0', require: false
-
- gem 'benchmark-ips', require: false
- gem 'benchmark-ips', '~> 2.3.0', require: false
-
- gem "license_finder", require: false
- gem 'knapsack'
- gem 'license_finder', '~> 2.1.0', require: false
- gem 'knapsack', '~> 1.11.0'
-end
-
-group :test do
@ -82,15 +80,15 @@ Index: gitlab/Gemfile
- gem 'email_spec', '~> 1.6.0'
- gem 'webmock', '~> 1.21.0'
- gem 'test_after_commit', '~> 0.4.2'
- gem 'sham_rack'
- gem 'sham_rack', '~> 1.3.6'
-end
-
-group :production do
- gem "gitlab_meta", '7.0'
- gem 'gitlab_meta', '7.0'
-end
-
-gem "newrelic_rpm", '~> 3.14'
-gem 'newrelic_rpm', '~> 3.14'
-
gem 'octokit', '~> 4.3'
gem "mail_room", "~> 0.8"
gem 'mail_room', '~> 0.8'

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

@ -12,11 +12,11 @@ Index: gitlab/Gemfile
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -14,8 +14,9 @@ gem 'sprockets', '~> 3.3'
gem "default_value_for", "~> 3.0"
gem 'default_value_for', '~> 3.0'
# Supported DBs
-gem "mysql2", '~> 0.3.16', group: :mysql
-gem "pg", '~> 0.18.2', group: :postgres
-gem 'mysql2', '~> 0.3.16', group: :mysql
-gem 'pg', '~> 0.18.2', group: :postgres
+ENV["DB"] ||= "mysql"
+gem "mysql2", '~> 0.3.16' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"

13
debian/patches/051-relax-omniauth-google-oauth2.patch vendored
View file

@ -1,13 +0,0 @@
Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -28,7 +28,7 @@ gem 'omniauth-cas3', '~> 1.1',
gem 'omniauth-facebook', '~> 3.0'
gem 'omniauth-github', '~> 1.1', '>= 1.1.1'
gem 'omniauth-gitlab', '~> 1.0'
-gem 'omniauth-google-oauth2', '~> 0.2.0'
+gem 'omniauth-google-oauth2', '~> 0.4.1'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-saml', '~> 1.5'
gem 'omniauth-shibboleth', '~> 1.2'

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

@ -5,7 +5,7 @@ Index: gitlab/Gemfile
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -69,7 +69,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.2',
gem "github-linguist", "~> 4.7", require: "linguist"
gem 'github-linguist', '~> 4.7', require: 'linguist'
# API
-gem 'grape', '~> 0.13.0'

13
debian/patches/053-relax-rouge.patch vendored
View file

@ -1,13 +0,0 @@
Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -113,7 +113,7 @@ gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5', '>= 1.5.2'
-gem 'rouge', '~> 1.11'
+gem 'rouge', '~> 2.0', '>= 2.0.2'
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM

28
debian/patches/runners.patch vendored
View file

@ -6,19 +6,21 @@ Reviewed-By: Dmitry Smirnov <onlyjob@debian.org>
Description: fix error 500 on runners page.
"ActionView::Template::Error (Missing partial kaminari/_paginator"
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -69,5 +69,5 @@
%th
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"
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -66,9 +66,9 @@
.pull-right
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'
@ -27,11 +29,11 @@ Description: fix error 500 on runners page.
.col-md-6
%h4 Recent builds served by this runner
%table.table.builds.runner-builds
--- a/app/views/projects/runners/_specific_runners.html.haml
+++ b/app/views/projects/runners/_specific_runners.html.haml
@@ -25,5 +25,5 @@
- if @assignable_runners.any?
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

2
debian/patches/series vendored
View file

@ -3,7 +3,6 @@
0018-loosen-rdoc.patch
0042-relax-grape-entity.patch
0050-relax-stable-libs.patch
051-relax-omniauth-google-oauth2.patch
0100-remove-development-test.patch
0108-make-mysql-optional.patch
source-init-functions.patch
@ -11,4 +10,3 @@ pid-log-paths.patch
runners.patch
0200-use-jquery-for-jquery2.patch
052-relax-grape.patch
053-relax-rouge.patch