allow unicorn 5.0
This commit is contained in:
parent
bdf4314790
commit
5ab33f4c7f
3 changed files with 19 additions and 20 deletions
5
debian/changelog
vendored
5
debian/changelog
vendored
|
@ -1,8 +1,9 @@
|
|||
gitlab (8.9.0+dfsg-7) UNRELEASED; urgency=medium
|
||||
gitlab (8.9.0+dfsg-7) unstable; urgency=medium
|
||||
|
||||
* Tighten dependencies
|
||||
* Allow unicorn 5.0
|
||||
|
||||
-- Pirate Praveen <praveen@debian.org> Thu, 21 Jul 2016 10:56:36 +0530
|
||||
-- Pirate Praveen <praveen@debian.org> Thu, 21 Jul 2016 13:51:37 +0530
|
||||
|
||||
gitlab (8.9.0+dfsg-6) unstable; urgency=medium
|
||||
|
||||
|
|
2
debian/control
vendored
2
debian/control
vendored
|
@ -118,7 +118,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
|
|||
# Diffs
|
||||
ruby-diffy (>= 3.0.3~),
|
||||
# Application server
|
||||
unicorn (>= 4.9.0~),
|
||||
unicorn (>= 5.0.1~),
|
||||
ruby-unicorn-worker-killer (>= 0.4.2~),
|
||||
# State machine
|
||||
ruby-state-machines-activerecord (>= 0.4.0~),
|
||||
|
|
30
debian/patches/0050-relax-stable-libs.patch
vendored
30
debian/patches/0050-relax-stable-libs.patch
vendored
|
@ -1,10 +1,8 @@
|
|||
We should be able to update minor versions of stable libs without breaking
|
||||
gitlab Gemfile
|
||||
|
||||
Index: gitlab/Gemfile
|
||||
===================================================================
|
||||
--- gitlab.orig/Gemfile
|
||||
+++ gitlab/Gemfile
|
||||
--- a/Gemfile
|
||||
+++ b/Gemfile
|
||||
@@ -1,7 +1,7 @@
|
||||
source "https://rubygems.org"
|
||||
|
||||
|
@ -14,7 +12,7 @@ Index: gitlab/Gemfile
|
|||
|
||||
# Responders respond_to and respond_with
|
||||
gem 'responders', '~> 2.0'
|
||||
@@ -11,7 +11,7 @@ gem 'responders', '~> 2.0'
|
||||
@@ -11,7 +11,7 @@
|
||||
gem 'sprockets', '~> 3.3'
|
||||
|
||||
# Default values for AR models
|
||||
|
@ -23,7 +21,7 @@ Index: gitlab/Gemfile
|
|||
|
||||
# Supported DBs
|
||||
gem "mysql2", '~> 0.3.16', group: :mysql
|
||||
@@ -20,21 +20,21 @@ gem "pg", '~> 0.18.2', group: :postgres
|
||||
@@ -20,21 +20,21 @@
|
||||
# Authentication libraries
|
||||
gem 'devise', '~> 4.0'
|
||||
gem 'doorkeeper', '~> 3.1'
|
||||
|
@ -56,7 +54,7 @@ Index: gitlab/Gemfile
|
|||
gem 'jwt'
|
||||
|
||||
# Spam and anti-bot protection
|
||||
@@ -42,9 +42,9 @@ gem 'recaptcha', '~> 3.0', require: 'rec
|
||||
@@ -42,9 +42,9 @@
|
||||
gem 'akismet', '~> 2.0'
|
||||
|
||||
# Two-factor authentication
|
||||
|
@ -68,7 +66,7 @@ Index: gitlab/Gemfile
|
|||
gem 'u2f', '~> 0.2.1'
|
||||
|
||||
# Browser detection
|
||||
@@ -61,11 +61,11 @@ gem 'omniauth-ldap', '~> 1.0.4', require
|
||||
@@ -61,11 +61,11 @@
|
||||
|
||||
# Git Wiki
|
||||
# Required manually in config/initializers/gollum.rb to control load order
|
||||
|
@ -82,7 +80,7 @@ Index: gitlab/Gemfile
|
|||
|
||||
# API
|
||||
gem 'grape', '~> 0.13.0'
|
||||
@@ -99,31 +99,31 @@ gem "unf", '~> 0.1.4'
|
||||
@@ -99,31 +99,31 @@
|
||||
gem "six", '~> 0.2.0'
|
||||
|
||||
# Seed data
|
||||
|
@ -120,11 +118,11 @@ Index: gitlab/Gemfile
|
|||
# Application server
|
||||
group :unicorn do
|
||||
- gem "unicorn", '~> 4.9.0'
|
||||
+ gem "unicorn", '~> 4.9'
|
||||
+ gem "unicorn", '~> 5.0'
|
||||
gem 'unicorn-worker-killer', '~> 0.4.2'
|
||||
end
|
||||
|
||||
@@ -136,7 +136,7 @@ gem 'after_commit_queue'
|
||||
@@ -136,7 +136,7 @@
|
||||
gem 'acts-as-taggable-on', '~> 3.4'
|
||||
|
||||
# Background jobs
|
||||
|
@ -133,7 +131,7 @@ Index: gitlab/Gemfile
|
|||
gem 'sidekiq', '~> 4.0'
|
||||
gem 'sidekiq-cron', '~> 0.4.0'
|
||||
gem 'redis-namespace'
|
||||
@@ -148,33 +148,33 @@ gem "httparty", '~> 0.13.3'
|
||||
@@ -148,33 +148,33 @@
|
||||
gem "rainbow", '~> 2.1.0'
|
||||
|
||||
# GitLab settings
|
||||
|
@ -174,7 +172,7 @@ Index: gitlab/Gemfile
|
|||
|
||||
# Asana integration
|
||||
gem 'asana', '~> 0.4.0'
|
||||
@@ -183,29 +183,29 @@ gem 'asana', '~> 0.4.0'
|
||||
@@ -183,29 +183,29 @@
|
||||
gem 'ruby-fogbugz', '~> 0.2.1'
|
||||
|
||||
# d3
|
||||
|
@ -212,7 +210,7 @@ Index: gitlab/Gemfile
|
|||
|
||||
# Detect and convert string character encoding
|
||||
gem 'charlock_holmes', '~> 0.7.3'
|
||||
@@ -213,30 +213,30 @@ gem 'charlock_holmes', '~> 0.7.3'
|
||||
@@ -213,30 +213,30 @@
|
||||
# Parse duration
|
||||
gem 'chronic_duration', '~> 0.10.6'
|
||||
|
||||
|
@ -261,7 +259,7 @@ Index: gitlab/Gemfile
|
|||
|
||||
# Metrics
|
||||
group :metrics do
|
||||
@@ -328,7 +328,7 @@ end
|
||||
@@ -328,7 +328,7 @@
|
||||
|
||||
gem "newrelic_rpm", '~> 3.14'
|
||||
|
||||
|
@ -270,7 +268,7 @@ Index: gitlab/Gemfile
|
|||
|
||||
gem "mail_room", "~> 0.8"
|
||||
|
||||
@@ -339,10 +339,10 @@ gem 'activerecord-session_store', '~> 1.
|
||||
@@ -339,10 +339,10 @@
|
||||
gem "nested_form", '~> 0.3.2'
|
||||
|
||||
# OAuth
|
||||
|
|
Loading…
Reference in a new issue