realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update dependencies

Browse source
This commit is contained in:
Praveen Arimbrathodiyil 2016-06-23 22:02:56 +05:30
parent efa420e390
commit 3deed8f868
4 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -1,8 +1,9 @@
gitlab (8.9.0+dfsg-1) UNRELEASED; urgency=medium gitlab (8.9.0+dfsg-1) UNRELEASED; urgency=medium
* New upstream release * New upstream release
* Refresh patches and update dependencies
-- Pirate Praveen <praveen@debian.org> Wed, 22 Jun 2016 15:31:28 +0530 -- Pirate Praveen <praveen@debian.org> Thu, 23 Jun 2016 22:02:23 +0530
gitlab (8.9.0+dfsg~rc4-1) experimental; urgency=medium gitlab (8.9.0+dfsg~rc4-1) experimental; urgency=medium

6
debian/control vendored
View file

@ -67,9 +67,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-attr-encrypted (>= 3.0~), ruby-attr-encrypted (>= 3.0~),
ruby-u2f, ruby-u2f,
# Browser detection # Browser detection
ruby-browser (>= 2.0~), ruby-browser (>= 2.2~),
# Extracting information from a git repository # Extracting information from a git repository
ruby-gitlab-git (>= 10.0~), ruby-gitlab-git (>= 10.2~),
# LDAP Auth # LDAP Auth
# Debian package includes gitlab patches # Debian package includes gitlab patches
ruby-omniauth-ldap (>= 1.0.4~), ruby-omniauth-ldap (>= 1.0.4~),
@ -207,7 +207,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-sentry-raven, ruby-sentry-raven,
ruby-premailer-rails, ruby-premailer-rails,
ruby-octokit (>= 4.3.0~), ruby-octokit (>= 4.3.0~),
ruby-mail-room (>= 0.7~), ruby-mail-room (>= 0.8~),
ruby-email-reply-parser (>= 0.5.8~), ruby-email-reply-parser (>= 0.5.8~),
## CI ## CI
ruby-activerecord-deprecated-finders (>= 1.0.3-2~), ruby-activerecord-deprecated-finders (>= 1.0.3-2~),

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

@ -56,7 +56,7 @@ Index: gitlab/Gemfile
gem 'jwt' gem 'jwt'
# Spam and anti-bot protection # Spam and anti-bot protection
@@ -42,13 +42,13 @@ gem 'recaptcha', '~> 3.0', require: 'rec @@ -42,9 +42,9 @@ gem 'recaptcha', '~> 3.0', require: 'rec
gem 'akismet', '~> 2.0' gem 'akismet', '~> 2.0'
# Two-factor authentication # Two-factor authentication
@ -68,11 +68,6 @@ Index: gitlab/Gemfile
gem 'u2f', '~> 0.2.1' gem 'u2f', '~> 0.2.1'
# Browser detection # Browser detection
-gem "browser", '~> 2.0.3'
+gem "browser", '~> 2.0', '>= 2.0.3'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
@@ -61,11 +61,11 @@ gem 'omniauth-ldap', '~> 1.0.4', require @@ -61,11 +61,11 @@ gem 'omniauth-ldap', '~> 1.0.4', require
# Git Wiki # Git Wiki
@ -217,7 +212,7 @@ 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' @@ -213,30 +213,30 @@ gem 'charlock_holmes', '~> 0.7.3'
# Parse duration # Parse duration
gem 'chronic_duration', '~> 0.10.6' gem 'chronic_duration', '~> 0.10.6'
@ -226,23 +221,24 @@ Index: gitlab/Gemfile
-gem "uglifier", '~> 2.7.2' -gem "uglifier", '~> 2.7.2'
-gem 'turbolinks', '~> 2.5.0' -gem 'turbolinks', '~> 2.5.0'
-gem 'jquery-turbolinks', '~> 2.1.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 "sass-rails", '~> 5.0'
+gem "coffee-rails", '~> 4.1' +gem "coffee-rails", '~> 4.1'
+gem "uglifier", '~> 2.7', '>= 2.7.2' +gem "uglifier", '~> 2.7', '>= 2.7.2'
+gem 'turbolinks', '~> 2.5' +gem 'turbolinks', '~> 2.5'
+gem 'jquery-turbolinks', '~> 2.1' +gem 'jquery-turbolinks', '~> 2.1'
+
-gem 'addressable', '~> 2.3.8'
-gem 'bootstrap-sass', '~> 3.3.0'
+gem 'addressable', '~> 2.3', '>= 2.3.8' +gem 'addressable', '~> 2.3', '>= 2.3.8'
+gem 'bootstrap-sass', '~> 3.3' +gem 'bootstrap-sass', '~> 3.3'
gem 'font-awesome-rails', '~> 4.2' +gem 'font-awesome-rails', '~> 4.6', '>= 4.6.1'
gem 'gitlab_emoji', '~> 0.3.0' gem 'gitlab_emoji', '~> 0.3.0'
-gem 'gon', '~> 6.0.1' -gem 'gon', '~> 6.0.1'
-gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails', '~> 4.1.0' -gem 'jquery-rails', '~> 4.1.0'
-gem 'jquery-ui-rails', '~> 5.0.0' -gem 'jquery-ui-rails', '~> 5.0.0'
-gem 'raphael-rails', '~> 2.1.2'
-gem 'request_store', '~> 1.3.0' -gem 'request_store', '~> 1.3.0'
-gem 'select2-rails', '~> 3.5.9' -gem 'select2-rails', '~> 3.5.9'
-gem 'virtus', '~> 1.0.1' -gem 'virtus', '~> 1.0.1'
@ -251,7 +247,6 @@ Index: gitlab/Gemfile
+gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2' +gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
+gem 'jquery-rails', '~> 4.0' +gem 'jquery-rails', '~> 4.0'
+gem 'jquery-ui-rails', '~> 5.0' +gem 'jquery-ui-rails', '~> 5.0'
+gem 'raphael-rails', '~> 2.1', '>= 2.1.2'
+gem 'request_store', '~> 1.3' +gem 'request_store', '~> 1.3'
+gem 'select2-rails', '~> 3.5', '>= 3.5.9' +gem 'select2-rails', '~> 3.5', '>= 3.5.9'
+gem 'virtus', '~> 1.0', '>= 1.0.1' +gem 'virtus', '~> 1.0', '>= 1.0.1'
@ -266,16 +261,16 @@ Index: gitlab/Gemfile
# Metrics # Metrics
group :metrics do group :metrics do
@@ -329,7 +329,7 @@ end @@ -328,7 +328,7 @@ end
gem "newrelic_rpm", '~> 3.14' gem "newrelic_rpm", '~> 3.14'
-gem 'octokit', '~> 4.3.0' -gem 'octokit', '~> 4.3.0'
+gem 'octokit', '~> 4.3' +gem 'octokit', '~> 4.3'
gem "mail_room", "~> 0.7" gem "mail_room", "~> 0.8"
@@ -340,10 +340,10 @@ gem 'activerecord-session_store', '~> 1. @@ -339,10 +339,10 @@ gem 'activerecord-session_store', '~> 1.
gem "nested_form", '~> 0.3.2' gem "nested_form", '~> 0.3.2'
# OAuth # OAuth

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

@ -4,7 +4,7 @@ Index: gitlab/Gemfile
=================================================================== ===================================================================
--- gitlab.orig/Gemfile --- gitlab.orig/Gemfile
+++ gitlab/Gemfile +++ gitlab/Gemfile
@@ -246,89 +246,6 @@ group :metrics do @@ -245,89 +245,6 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false gem 'influxdb', '~> 0.2', require: false
end end
@ -93,4 +93,4 @@ Index: gitlab/Gemfile
- -
gem 'octokit', '~> 4.3' gem 'octokit', '~> 4.3'
gem "mail_room", "~> 0.7" gem "mail_room", "~> 0.8"