[DRE-commits] [gitlab] 02/04: refresh patches at 8.1.0
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sat Oct 24 16:22:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository gitlab.
commit 6bdfba8d684e99dd38f46d03e7c32ffedb492dab
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Sat Oct 24 20:10:10 2015 +0530
refresh patches at 8.1.0
---
debian/patches/0002-loosen-devise.patch | 12 +++++------
debian/patches/0003-loosen-doorkeeper.patch | 18 ++++++++--------
debian/patches/0004-loosen-rack-oauth2.patch | 10 ++++-----
debian/patches/0005-use-debian-omniauth-ldap.patch | 2 +-
debian/patches/0006-loosen-grape.patch | 10 ++++-----
debian/patches/0012-loosen-stamp.patch | 2 +-
debian/patches/0013-loosen-enumerize.patch | 4 ++--
debian/patches/0015-loosen-carrierwave.patch | 2 +-
debian/patches/0016-loosen-fog.patch | 2 +-
debian/patches/0017-loosen-redcarpet.patch | 4 ++--
debian/patches/0018-loosen-rdoc.patch | 2 +-
debian/patches/0019-loosen-creole.patch | 2 +-
debian/patches/0020-loosen-unicorn.patch | 2 +-
debian/patches/0021-loosen-sidekiq.patch | 4 ++--
debian/patches/0022-loosen-colorize.patch | 2 +-
debian/patches/0025-loosen-asana.patch | 4 ++--
debian/patches/0026-disable-fogbugz.patch | 2 +-
debian/patches/0027-loosen-underscore-rails.patch | 2 +-
debian/patches/0028-loosen-ace-rails-ap.patch | 2 +-
debian/patches/0029-loosen-sass-rails.patch | 4 ++--
debian/patches/0031-loosen-jquery-turbolinks.patch | 4 ++--
debian/patches/0032-loosen-gon.patch | 2 +-
debian/patches/0033-jquery-atwho-rails.patch | 2 +-
debian/patches/0034-loosen-jquery-rails.patch | 2 +-
debian/patches/0035-loosen-jquery-ui-rails.patch | 2 +-
debian/patches/0036-loosen-nprogress-rails.patch | 2 +-
debian/patches/0037-loosen-request-store.patch | 14 +++++++++++-
debian/patches/0100-remove-development-test.patch | 25 +++++++++++-----------
debian/patches/0101-disable-newrelic.patch | 2 +-
debian/patches/0102-loosen-octokit.patch | 4 ++--
debian/patches/0106-loosen-gollum-lib.patch | 2 +-
debian/patches/loosen-rails-version.patch | 7 +++---
debian/patches/series | 12 -----------
33 files changed, 85 insertions(+), 87 deletions(-)
diff --git a/debian/patches/0002-loosen-devise.patch b/debian/patches/0002-loosen-devise.patch
index 8fbf152..768b097 100644
--- a/debian/patches/0002-loosen-devise.patch
+++ b/debian/patches/0002-loosen-devise.patch
@@ -4,12 +4,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -22,7 +22,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql
+@@ -14,7 +14,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql
gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries
--gem "devise", '~> 3.5.2'
-+gem "devise", '~> 3.5.1'
- gem "devise-async", '~> 0.9.0'
- gem 'omniauth', "~> 1.2.2"
- gem 'omniauth-google-oauth2', '~> 0.2.5'
+-gem 'devise', '~> 3.5.2'
++gem 'devise', '~> 3.5.1'
+ gem 'devise-async', '~> 0.9.0'
+ gem 'doorkeeper', '~> 2.1.3'
+ gem 'omniauth', '~> 1.2.2'
diff --git a/debian/patches/0003-loosen-doorkeeper.patch b/debian/patches/0003-loosen-doorkeeper.patch
index 936dfca..fa7dd29 100644
--- a/debian/patches/0003-loosen-doorkeeper.patch
+++ b/debian/patches/0003-loosen-doorkeeper.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -33,7 +33,7 @@ gem 'omniauth-kerberos', '~> 0.2.0', gro
- gem 'omniauth-gitlab', '~> 1.0.0'
- gem 'omniauth-bitbucket', '~> 0.0.2'
- gem 'omniauth-saml', '~> 1.4.0'
--gem 'doorkeeper', '~> 2.1.3'
-+gem 'doorkeeper', '~> 2.1'
- gem 'omniauth_crowd'
- gem "rack-oauth2", "~> 1.0.5"
-
+@@ -16,7 +16,7 @@ gem "pg", '~> 0.18.2', group: :postgres
+ # Authentication libraries
+ gem 'devise', '~> 3.5.1'
+ gem 'devise-async', '~> 0.9.0'
+-gem 'doorkeeper', '~> 2.1.3'
++gem 'doorkeeper', '~> 2.1'
+ gem 'omniauth', '~> 1.2.2'
+ gem 'omniauth-bitbucket', '~> 0.0.2'
+ gem 'omniauth-github', '~> 1.1.1'
diff --git a/debian/patches/0004-loosen-rack-oauth2.patch b/debian/patches/0004-loosen-rack-oauth2.patch
index b1d7e04..414167c 100644
--- a/debian/patches/0004-loosen-rack-oauth2.patch
+++ b/debian/patches/0004-loosen-rack-oauth2.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -35,7 +35,7 @@ gem 'omniauth-bitbucket', '~> 0.0.2'
- gem 'omniauth-saml', '~> 1.4.0'
- gem 'doorkeeper', '~> 2.1'
+@@ -27,7 +27,7 @@ gem 'omniauth-saml', '~> 1.4.0'
+ gem 'omniauth-shibboleth', '~> 1.2.0'
+ gem 'omniauth-twitter', '~> 1.2.0'
gem 'omniauth_crowd'
--gem "rack-oauth2", "~> 1.0.5"
-+gem "rack-oauth2", "~> 1.0"
+-gem 'rack-oauth2', '~> 1.0.5'
++gem 'rack-oauth2', '~> 1.0'
# Two-factor authentication
gem 'devise-two-factor', '~> 2.0.0'
diff --git a/debian/patches/0005-use-debian-omniauth-ldap.patch b/debian/patches/0005-use-debian-omniauth-ldap.patch
index 8518ec0..a0b6163 100644
--- a/debian/patches/0005-use-debian-omniauth-ldap.patch
+++ b/debian/patches/0005-use-debian-omniauth-ldap.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -52,7 +52,7 @@ gem "gitlab_git", '~> 7.2.15'
+@@ -44,7 +44,7 @@ gem "gitlab_git", '~> 7.2.19'
# 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
diff --git a/debian/patches/0006-loosen-grape.patch b/debian/patches/0006-loosen-grape.patch
index 20022d8..3544a1b 100644
--- a/debian/patches/0006-loosen-grape.patch
+++ b/debian/patches/0006-loosen-grape.patch
@@ -4,12 +4,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -65,7 +65,7 @@ gem 'gollum-lib', '~> 4.0.2'
+@@ -57,7 +57,7 @@ gem 'gollum-lib', '~> 4.0.2'
gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
# API
--gem "grape", "~> 0.6.1"
-+gem "grape", "~> 0.6"
- gem "grape-entity", "~> 0.4.2"
- gem 'rack-cors', '~> 0.2.9', require: 'rack/cors'
+-gem 'grape', '~> 0.6.1'
++gem 'grape', '~> 0.6'
+ gem 'grape-entity', '~> 0.4.2'
+ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
diff --git a/debian/patches/0012-loosen-stamp.patch b/debian/patches/0012-loosen-stamp.patch
index fa94596..5ea2da4 100644
--- a/debian/patches/0012-loosen-stamp.patch
+++ b/debian/patches/0012-loosen-stamp.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -71,7 +71,7 @@ gem 'rack-cors', '~> 0.4.0', require: 'r
+@@ -63,7 +63,7 @@ gem 'rack-cors', '~> 0.4.0', require:
# Format dates and times
# based on human-friendly examples
diff --git a/debian/patches/0013-loosen-enumerize.patch b/debian/patches/0013-loosen-enumerize.patch
index 7cc65af..bd913ee 100644
--- a/debian/patches/0013-loosen-enumerize.patch
+++ b/debian/patches/0013-loosen-enumerize.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -74,7 +74,7 @@ gem 'rack-cors', '~> 0.4.0', require: 'r
+@@ -66,7 +66,7 @@ gem 'rack-cors', '~> 0.4.0', require:
gem "stamp", '~> 0.6.0'
# Enumeration fields
@@ -10,4 +10,4 @@ Index: gitlab/Gemfile
+gem 'enumerize', '~> 1.0.0'
# Pagination
- gem "kaminari", "~> 0.15.1"
+ gem "kaminari", "~> 0.16.3"
diff --git a/debian/patches/0015-loosen-carrierwave.patch b/debian/patches/0015-loosen-carrierwave.patch
index 7fa692a..d04473a 100644
--- a/debian/patches/0015-loosen-carrierwave.patch
+++ b/debian/patches/0015-loosen-carrierwave.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -83,7 +83,7 @@ gem "kaminari", "~> 0.15.1"
+@@ -75,7 +75,7 @@ gem "kaminari", "~> 0.16.3"
gem "haml-rails", '~> 0.9.0'
# Files attachments
diff --git a/debian/patches/0016-loosen-fog.patch b/debian/patches/0016-loosen-fog.patch
index 90bf3d4..81b7bf0 100644
--- a/debian/patches/0016-loosen-fog.patch
+++ b/debian/patches/0016-loosen-fog.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -89,7 +89,7 @@ gem "carrierwave", '~> 0.10.0'
+@@ -81,7 +81,7 @@ gem "carrierwave", '~> 0.10.0'
gem 'dropzonejs-rails', '~> 0.7.1'
# for aws storage
diff --git a/debian/patches/0017-loosen-redcarpet.patch b/debian/patches/0017-loosen-redcarpet.patch
index 73df948..94bbf3f 100644
--- a/debian/patches/0017-loosen-redcarpet.patch
+++ b/debian/patches/0017-loosen-redcarpet.patch
@@ -2,11 +2,11 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -102,7 +102,7 @@ gem "seed-fu", '~> 2.3.5'
+@@ -94,7 +94,7 @@ gem "seed-fu", '~> 2.3.5'
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.2'
+-gem 'redcarpet', '~> 3.3.3'
+gem 'redcarpet', '~> 3.2.3'
gem 'RedCloth', '~> 4.2.9'
gem 'rdoc', '~>3.6'
diff --git a/debian/patches/0018-loosen-rdoc.patch b/debian/patches/0018-loosen-rdoc.patch
index 62ee9ae..be036d1 100644
--- a/debian/patches/0018-loosen-rdoc.patch
+++ b/debian/patches/0018-loosen-rdoc.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -104,7 +104,7 @@ gem 'task_list', '~> 1.0.2', require
+@@ -96,7 +96,7 @@ gem 'task_list', '~> 1.0.2', require
gem 'github-markup', '~> 1.3.1'
gem 'redcarpet', '~> 3.2.3'
gem 'RedCloth', '~> 4.2.9'
diff --git a/debian/patches/0019-loosen-creole.patch b/debian/patches/0019-loosen-creole.patch
index 5e9d102..78c03e6 100644
--- a/debian/patches/0019-loosen-creole.patch
+++ b/debian/patches/0019-loosen-creole.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -106,7 +106,7 @@ gem 'redcarpet', '~> 3.2.3'
+@@ -98,7 +98,7 @@ gem 'redcarpet', '~> 3.2.3'
gem 'RedCloth', '~> 4.2.9'
gem 'rdoc', '~> 4.1'
gem 'org-ruby', '~> 0.9.12'
diff --git a/debian/patches/0020-loosen-unicorn.patch b/debian/patches/0020-loosen-unicorn.patch
index 2457157..bf92453 100644
--- a/debian/patches/0020-loosen-unicorn.patch
+++ b/debian/patches/0020-loosen-unicorn.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -115,7 +115,7 @@ gem 'diffy', '~> 3.0.3'
+@@ -107,7 +107,7 @@ gem 'diffy', '~> 3.0.3'
# Application server
group :unicorn do
diff --git a/debian/patches/0021-loosen-sidekiq.patch b/debian/patches/0021-loosen-sidekiq.patch
index 5245f26..cc58811 100644
--- a/debian/patches/0021-loosen-sidekiq.patch
+++ b/debian/patches/0021-loosen-sidekiq.patch
@@ -2,9 +2,9 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -128,7 +128,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
+@@ -121,7 +121,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
+
# Background jobs
- gem 'slim', '~> 2.0.2'
gem 'sinatra', '~> 1.4.4', require: nil
-gem 'sidekiq', '3.3.0'
+gem 'sidekiq', '3.4.2'
diff --git a/debian/patches/0022-loosen-colorize.patch b/debian/patches/0022-loosen-colorize.patch
index e4f96d4..fddc7b0 100644
--- a/debian/patches/0022-loosen-colorize.patch
+++ b/debian/patches/0022-loosen-colorize.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -136,7 +136,7 @@ gem "httparty", '~> 0.13.3'
+@@ -129,7 +129,7 @@ gem "httparty", '~> 0.13.3'
# Colored output to console
gem "colored", '~> 1.2'
diff --git a/debian/patches/0025-loosen-asana.patch b/debian/patches/0025-loosen-asana.patch
index 7fbf345..b851c90 100644
--- a/debian/patches/0025-loosen-asana.patch
+++ b/debian/patches/0025-loosen-asana.patch
@@ -2,8 +2,8 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -164,7 +164,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
- gem "slack-notifier", "~> 1.2.1"
+@@ -157,7 +157,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
+ gem "slack-notifier", "~> 1.2.0"
# Asana integration
-gem 'asana', '~> 0.0.6'
diff --git a/debian/patches/0026-disable-fogbugz.patch b/debian/patches/0026-disable-fogbugz.patch
index b749b78..e7b5344 100644
--- a/debian/patches/0026-disable-fogbugz.patch
+++ b/debian/patches/0026-disable-fogbugz.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -167,7 +167,7 @@ gem "slack-notifier", "~> 1.2.1"
+@@ -160,7 +160,7 @@ gem "slack-notifier", "~> 1.2.0"
gem 'asana', '~> 0.1.2'
# FogBugz integration
diff --git a/debian/patches/0027-loosen-underscore-rails.patch b/debian/patches/0027-loosen-underscore-rails.patch
index 0e4c7e4..d9f6871 100644
--- a/debian/patches/0027-loosen-underscore-rails.patch
+++ b/debian/patches/0027-loosen-underscore-rails.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -176,7 +176,7 @@ gem 'd3_rails', '~> 3.5.5'
+@@ -169,7 +169,7 @@ gem 'd3_rails', '~> 3.5.5'
gem "cal-heatmap-rails", "~> 0.0.1"
# underscore-rails
diff --git a/debian/patches/0028-loosen-ace-rails-ap.patch b/debian/patches/0028-loosen-ace-rails-ap.patch
index dc926d6..8147dab 100644
--- a/debian/patches/0028-loosen-ace-rails-ap.patch
+++ b/debian/patches/0028-loosen-ace-rails-ap.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -185,7 +185,7 @@ gem "sanitize", '~> 2.0'
+@@ -178,7 +178,7 @@ gem "sanitize", '~> 2.0'
gem "rack-attack", '~> 4.3.0'
# Ace editor
diff --git a/debian/patches/0029-loosen-sass-rails.patch b/debian/patches/0029-loosen-sass-rails.patch
index 5851f92..4093f4c 100644
--- a/debian/patches/0029-loosen-sass-rails.patch
+++ b/debian/patches/0029-loosen-sass-rails.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -193,7 +193,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
+@@ -186,7 +186,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.6.9.4'
-gem "sass-rails", '~> 4.0.5'
+gem "sass-rails", '~> 5.0.3'
gem "coffee-rails", '~> 4.1.0'
- gem "uglifier", '~> 2.3.2'
+ gem "uglifier", '~> 2.7.2'
gem 'turbolinks', '~> 2.5.0'
diff --git a/debian/patches/0031-loosen-jquery-turbolinks.patch b/debian/patches/0031-loosen-jquery-turbolinks.patch
index e8dfb4b..c287414 100644
--- a/debian/patches/0031-loosen-jquery-turbolinks.patch
+++ b/debian/patches/0031-loosen-jquery-turbolinks.patch
@@ -2,9 +2,9 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -197,7 +197,7 @@ gem "sass-rails", '~> 5.0.3'
+@@ -190,7 +190,7 @@ gem "sass-rails", '~> 5.0.3'
gem "coffee-rails", '~> 4.1.0'
- gem "uglifier", '~> 2.3'
+ gem "uglifier", '~> 2.7.2'
gem 'turbolinks', '~> 2.5.0'
-gem 'jquery-turbolinks', '~> 2.0.1'
+gem 'jquery-turbolinks', '~> 2.1.0'
diff --git a/debian/patches/0032-loosen-gon.patch b/debian/patches/0032-loosen-gon.patch
index 2893bb5..2825cbc 100644
--- a/debian/patches/0032-loosen-gon.patch
+++ b/debian/patches/0032-loosen-gon.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -203,7 +203,7 @@ gem 'addressable', '~> 2.3.8'
+@@ -196,7 +196,7 @@ gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.0'
gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.1'
diff --git a/debian/patches/0033-jquery-atwho-rails.patch b/debian/patches/0033-jquery-atwho-rails.patch
index e677f0e..99e75cf 100644
--- a/debian/patches/0033-jquery-atwho-rails.patch
+++ b/debian/patches/0033-jquery-atwho-rails.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -204,7 +204,7 @@ gem 'bootstrap-sass', '~> 3.0'
+@@ -197,7 +197,7 @@ gem 'bootstrap-sass', '~> 3.0'
gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.1'
gem 'gon', '~> 6.0.1'
diff --git a/debian/patches/0034-loosen-jquery-rails.patch b/debian/patches/0034-loosen-jquery-rails.patch
index c0340cb..75b0f0f 100644
--- a/debian/patches/0034-loosen-jquery-rails.patch
+++ b/debian/patches/0034-loosen-jquery-rails.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -205,7 +205,7 @@ gem 'font-awesome-rails', '~> 4.2'
+@@ -198,7 +198,7 @@ gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.1'
gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
diff --git a/debian/patches/0035-loosen-jquery-ui-rails.patch b/debian/patches/0035-loosen-jquery-ui-rails.patch
index 74f0589..8919af8 100644
--- a/debian/patches/0035-loosen-jquery-ui-rails.patch
+++ b/debian/patches/0035-loosen-jquery-ui-rails.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -207,7 +207,7 @@ gem 'gon', '~> 6.0.1'
+@@ -200,7 +200,7 @@ gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.0.4'
gem 'jquery-scrollto-rails', '~> 1.4.3'
diff --git a/debian/patches/0036-loosen-nprogress-rails.patch b/debian/patches/0036-loosen-nprogress-rails.patch
index 1039287..2426cac 100644
--- a/debian/patches/0036-loosen-nprogress-rails.patch
+++ b/debian/patches/0036-loosen-nprogress-rails.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -208,7 +208,7 @@ gem 'jquery-atwho-rails', '~> 1.3.2'
+@@ -201,7 +201,7 @@ gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 4.0.4'
gem 'jquery-scrollto-rails', '~> 1.4.3'
gem 'jquery-ui-rails', '~> 5.0.5'
diff --git a/debian/patches/0037-loosen-request-store.patch b/debian/patches/0037-loosen-request-store.patch
index 0eb6546..a0f50a0 100644
--- a/debian/patches/0037-loosen-request-store.patch
+++ b/debian/patches/0037-loosen-request-store.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -210,7 +210,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
+@@ -203,7 +203,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
gem 'jquery-ui-rails', '~> 5.0.5'
gem 'nprogress-rails', '~> 0.1.6.7'
gem 'raphael-rails', '~> 2.1.2'
@@ -11,3 +11,15 @@ Index: gitlab/Gemfile
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
+@@ -280,6 +280,11 @@ group :production do
+ gem "gitlab_meta", '7.0'
+ end
+
++
++roup :production do
++ gem "gitlab_meta", '7.0'
++end
++
+ gem "newrelic_rpm", '~> 3.9.4.245'
+ gem 'newrelic-grape'
+
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 3440b63..7cd2337 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -214,70 +214,6 @@ gem 'request_store', '~> 1.1'
+@@ -207,80 +207,6 @@ gem 'request_store', '~> 1.1'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
@@ -15,6 +15,9 @@ Index: gitlab/Gemfile
- gem 'quiet_assets', '~> 1.0.2'
- gem 'rack-mini-profiler', '~> 0.9.0', require: false
- gem 'rerun', '~> 0.10.0'
+- gem 'bullet', require: false
+- gem 'active_record_query_trace', require: false
+- gem 'rack-lineprof', platform: :mri
-
- # Better errors handler
- gem 'better_errors', '~> 1.0.1'
@@ -60,6 +63,8 @@ Index: gitlab/Gemfile
- gem 'rubocop', '~> 0.28.0', require: false
- gem 'coveralls', '~> 0.8.2', require: false
- gem 'simplecov', '~> 0.10.0', require: false
+-
+- gem 'benchmark-ips', require: false
-end
-
-group :test do
@@ -70,17 +75,11 @@ Index: gitlab/Gemfile
- gem 'sham_rack'
-end
-
- group :production do
+-group :production do
+- gem "gitlab_meta", '7.0'
+-end
+-
+-
+ roup :production do
gem "gitlab_meta", '7.0'
end
-@@ -305,10 +241,3 @@ gem 'oauth2', '~> 1.0.0'
- # Soft deletion
- gem "paranoia", "~> 2.0"
-
--group :development, :test do
-- gem 'guard-rspec', '~> 4.2.0'
--
-- gem 'rb-fsevent', require: darwin_only('rb-fsevent')
-- gem 'growl', require: darwin_only('growl')
-- gem 'rb-inotify', require: linux_only('rb-inotify')
--end
diff --git a/debian/patches/0101-disable-newrelic.patch b/debian/patches/0101-disable-newrelic.patch
index 2d603d3..42c0722 100644
--- a/debian/patches/0101-disable-newrelic.patch
+++ b/debian/patches/0101-disable-newrelic.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -218,8 +218,8 @@ group :production do
+@@ -211,8 +211,8 @@ roup :production do
gem "gitlab_meta", '7.0'
end
diff --git a/debian/patches/0102-loosen-octokit.patch b/debian/patches/0102-loosen-octokit.patch
index 53e502e..a0b0368 100644
--- a/debian/patches/0102-loosen-octokit.patch
+++ b/debian/patches/0102-loosen-octokit.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -221,7 +221,7 @@ end
+@@ -214,7 +214,7 @@ end
#gem "newrelic_rpm", '~> 3.9.4.245'
#gem 'newrelic-grape'
-gem 'octokit', '~> 3.7.0'
+gem 'octokit', '~> 3.7'
- gem "mail_room", "~> 0.5.2"
+ gem "mail_room", "~> 0.6.1"
diff --git a/debian/patches/0106-loosen-gollum-lib.patch b/debian/patches/0106-loosen-gollum-lib.patch
index a251374..824048b 100644
--- a/debian/patches/0106-loosen-gollum-lib.patch
+++ b/debian/patches/0106-loosen-gollum-lib.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -55,7 +55,7 @@ gem "gitlab_git", '~> 7.2.15'
+@@ -47,7 +47,7 @@ gem "gitlab_git", '~> 7.2.19'
gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
# Git Wiki
diff --git a/debian/patches/loosen-rails-version.patch b/debian/patches/loosen-rails-version.patch
index bf45635..9c273ba 100644
--- a/debian/patches/loosen-rails-version.patch
+++ b/debian/patches/loosen-rails-version.patch
@@ -4,12 +4,11 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -8,7 +8,7 @@ def linux_only(require_as)
- RUBY_PLATFORM.include?('linux') && require_as
- end
+@@ -1,6 +1,6 @@
+ source "https://rubygems.org"
-gem 'rails', '4.1.12'
-+gem 'rails', '~> 4.2.4'
++gem 'rails', '~> 4.2'
# Specify a sprockets version due to security issue
# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
diff --git a/debian/patches/series b/debian/patches/series
index 9fbe961..90c9fc1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,14 +4,8 @@ loosen-rails-version.patch
0004-loosen-rack-oauth2.patch
0005-use-debian-omniauth-ldap.patch
0006-loosen-grape.patch
-0007-loosen-omniauth-google-oauth2.patch
-0008-loosen-omniauth-twitter.patch
-0009-loosen-omniauth-shibboleth.patch
-0010-loosen-omniauth-kerberos.patch
-0011-loosen-rack-cors.patch
0012-loosen-stamp.patch
0013-loosen-enumerize.patch
-0014-loosen-haml-rails.patch
0015-loosen-carrierwave.patch
0016-loosen-fog.patch
0017-loosen-redcarpet.patch
@@ -20,14 +14,11 @@ loosen-rails-version.patch
0020-loosen-unicorn.patch
0021-loosen-sidekiq.patch
0022-loosen-colorize.patch
-0023-loosen-tinder.patch
-0024-loosen-slack-notifier.patch
0025-loosen-asana.patch
0026-disable-fogbugz.patch
0027-loosen-underscore-rails.patch
0028-loosen-ace-rails-ap.patch
0029-loosen-sass-rails.patch
-0030-loosen-uglifier.patch
0031-loosen-jquery-turbolinks.patch
0032-loosen-gon.patch
0033-jquery-atwho-rails.patch
@@ -38,7 +29,4 @@ loosen-rails-version.patch
0100-remove-development-test.patch
0101-disable-newrelic.patch
0102-loosen-octokit.patch
-0103-loosen-whenever.patch
-0104-loosen-kaminari.patch
-0105-loosen-slim.patch
0106-loosen-gollum-lib.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git
More information about the Pkg-ruby-extras-commits
mailing list