[DRE-commits] [gitlab] 03/03: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Dec 22 21:08:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master-8.3.0
in repository gitlab.
commit daa3d11ba8ce972c35ac7f2832162d590b69cd0d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Wed Dec 23 02:32:54 2015 +0530
refresh patches
---
debian/patches/0002-loosen-devise.patch | 8 +-
debian/patches/0003-loosen-doorkeeper.patch | 13 ---
debian/patches/0004-loosen-rack-oauth2.patch | 13 ---
debian/patches/0005-use-debian-omniauth-ldap.patch | 4 +-
debian/patches/0013-loosen-enumerize.patch | 13 ---
debian/patches/0015-loosen-carrierwave.patch | 2 +-
debian/patches/0016-loosen-fog.patch | 2 +-
debian/patches/0017-loosen-redcarpet.patch | 2 +-
debian/patches/0018-loosen-rdoc.patch | 4 +-
debian/patches/0019-loosen-creole.patch | 13 ---
debian/patches/0020-loosen-unicorn.patch | 2 +-
debian/patches/0021-loosen-sidekiq.patch | 10 +--
debian/patches/0022-loosen-colorize.patch | 13 ---
debian/patches/0025-loosen-asana.patch | 13 ---
debian/patches/0027-loosen-underscore-rails.patch | 2 +-
debian/patches/0028-loosen-ace-rails-ap.patch | 4 +-
debian/patches/0029-loosen-sass-rails.patch | 2 +-
debian/patches/0031-loosen-jquery-turbolinks.patch | 13 ---
debian/patches/0032-loosen-gon.patch | 13 ---
debian/patches/0034-loosen-jquery-rails.patch | 4 +-
debian/patches/0035-loosen-jquery-ui-rails.patch | 2 +-
debian/patches/0037-loosen-request-store.patch | 6 +-
debian/patches/0100-remove-development-test.patch | 92 ----------------------
debian/patches/0102-loosen-octokit.patch | 6 +-
debian/patches/0107-relax-omniauth-facebook.patch | 4 +-
.../0300-no-hard-coded-workhorse-path.patch | 2 +-
debian/patches/loosen-rails-version.patch | 8 +-
debian/patches/series | 11 ---
28 files changed, 37 insertions(+), 244 deletions(-)
diff --git a/debian/patches/0002-loosen-devise.patch b/debian/patches/0002-loosen-devise.patch
index 768b097..2d3c21d 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
-@@ -14,7 +14,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql
+@@ -18,7 +18,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', '~> 3.5.3'
++gem 'devise', '~> 3.5.2'
gem 'devise-async', '~> 0.9.0'
- gem 'doorkeeper', '~> 2.1.3'
+ gem 'doorkeeper', '~> 2.2.0'
gem 'omniauth', '~> 1.2.2'
diff --git a/debian/patches/0003-loosen-doorkeeper.patch b/debian/patches/0003-loosen-doorkeeper.patch
deleted file mode 100644
index 70d7611..0000000
--- a/debian/patches/0003-loosen-doorkeeper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -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-facebook', '~> 3.0.0'
diff --git a/debian/patches/0004-loosen-rack-oauth2.patch b/debian/patches/0004-loosen-rack-oauth2.patch
deleted file mode 100644
index cb8dafb..0000000
--- a/debian/patches/0004-loosen-rack-oauth2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -28,7 +28,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'
-
- # 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 d85f798..a8be25e 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
-@@ -45,7 +45,7 @@ gem "gitlab_git", '~> 7.2.20'
+@@ -49,7 +49,7 @@ gem "gitlab_git", '~> 7.2.20'
# 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
@@ -10,4 +10,4 @@ Index: gitlab/Gemfile
+gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
# Git Wiki
- gem 'gollum-lib', '~> 4.0.2'
+ gem 'gollum-lib', '~> 4.1.0'
diff --git a/debian/patches/0013-loosen-enumerize.patch b/debian/patches/0013-loosen-enumerize.patch
deleted file mode 100644
index d2f2d79..0000000
--- a/debian/patches/0013-loosen-enumerize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -63,7 +63,7 @@ gem 'rack-cors', '~> 0.4.0', require:
- gem "stamp", '~> 0.6.0'
-
- # Enumeration fields
--gem 'enumerize', '~> 0.7.0'
-+gem 'enumerize', '~> 1.0.0'
-
- # Pagination
- gem "kaminari", "~> 0.16.3"
diff --git a/debian/patches/0015-loosen-carrierwave.patch b/debian/patches/0015-loosen-carrierwave.patch
index b0f73e3..e1b46ff 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
-@@ -72,7 +72,7 @@ gem "kaminari", "~> 0.16.3"
+@@ -73,7 +73,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 bf5c12e..875546c 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
-@@ -78,7 +78,7 @@ gem "carrierwave", '~> 0.10.0'
+@@ -79,7 +79,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 cb46abb..46ef308 100644
--- a/debian/patches/0017-loosen-redcarpet.patch
+++ b/debian/patches/0017-loosen-redcarpet.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -91,7 +91,7 @@ gem "seed-fu", '~> 2.3.5'
+@@ -92,7 +92,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'
diff --git a/debian/patches/0018-loosen-rdoc.patch b/debian/patches/0018-loosen-rdoc.patch
index f815b2c..73ab283 100644
--- a/debian/patches/0018-loosen-rdoc.patch
+++ b/debian/patches/0018-loosen-rdoc.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -93,7 +93,7 @@ gem 'task_list', '~> 1.0.2', require
+@@ -94,7 +94,7 @@ gem 'task_list', '~> 1.0.2', require
gem 'github-markup', '~> 1.3.1'
gem 'redcarpet', '~> 3.3.2'
gem 'RedCloth', '~> 4.2.9'
-gem 'rdoc', '~>3.6'
+gem 'rdoc', '~> 4.1'
gem 'org-ruby', '~> 0.9.12'
- gem 'creole', '~>0.3.6'
+ gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
diff --git a/debian/patches/0019-loosen-creole.patch b/debian/patches/0019-loosen-creole.patch
deleted file mode 100644
index 5d66efe..0000000
--- a/debian/patches/0019-loosen-creole.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -95,7 +95,7 @@ gem 'redcarpet', '~> 3.2.3'
- gem 'RedCloth', '~> 4.2.9'
- gem 'rdoc', '~> 4.1'
- gem 'org-ruby', '~> 0.9.12'
--gem 'creole', '~>0.3.6'
-+gem 'creole', '~> 0.5.0'
- gem 'wikicloth', '0.8.1'
- gem 'asciidoctor', '~> 1.5.2'
-
diff --git a/debian/patches/0020-loosen-unicorn.patch b/debian/patches/0020-loosen-unicorn.patch
index da25833..fc95ae9 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
-@@ -104,7 +104,7 @@ gem 'diffy', '~> 3.0.3'
+@@ -109,7 +109,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 b210720..87ef95b 100644
--- a/debian/patches/0021-loosen-sidekiq.patch
+++ b/debian/patches/0021-loosen-sidekiq.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -118,7 +118,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
+@@ -123,7 +123,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
# Background jobs
gem 'sinatra', '~> 1.4.4', require: nil
--gem 'sidekiq', '3.3.0'
-+gem 'sidekiq', '3.4.2'
- gem 'sidetiq', '~> 0.6.3'
+-gem 'sidekiq', '~> 4.0'
++gem 'sidekiq', '~> 3.4'
+ gem 'sidekiq-cron', '~> 0.4.0'
+ gem 'redis-namespace'
- # HTTP requests
diff --git a/debian/patches/0022-loosen-colorize.patch b/debian/patches/0022-loosen-colorize.patch
deleted file mode 100644
index 34cf1a8..0000000
--- a/debian/patches/0022-loosen-colorize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -126,7 +126,7 @@ gem "httparty", '~> 0.13.3'
-
- # Colored output to console
- gem "colored", '~> 1.2'
--gem "colorize", '~> 0.5.8'
-+gem "colorize", '~> 0.7.3'
-
- # GitLab settings
- gem 'settingslogic', '~> 2.0.9'
diff --git a/debian/patches/0025-loosen-asana.patch b/debian/patches/0025-loosen-asana.patch
deleted file mode 100644
index 9882167..0000000
--- a/debian/patches/0025-loosen-asana.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -154,7 +154,7 @@ gem "gemnasium-gitlab-service", "~> 0.2"
- gem "slack-notifier", "~> 1.2.0"
-
- # Asana integration
--gem 'asana', '~> 0.0.6'
-+gem 'asana', '~> 0.1.2'
-
- # FogBugz integration
- gem 'ruby-fogbugz', '~> 0.2.1'
diff --git a/debian/patches/0027-loosen-underscore-rails.patch b/debian/patches/0027-loosen-underscore-rails.patch
index a422203..493a884 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
-@@ -166,7 +166,7 @@ gem 'd3_rails', '~> 3.5.5'
+@@ -171,7 +171,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 1d8a673..25a7490 100644
--- a/debian/patches/0028-loosen-ace-rails-ap.patch
+++ b/debian/patches/0028-loosen-ace-rails-ap.patch
@@ -2,8 +2,8 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -175,7 +175,7 @@ gem "sanitize", '~> 2.0'
- gem "rack-attack", '~> 4.3.0'
+@@ -181,7 +181,7 @@ gem 'babosa', '~> 1.0.2'
+ gem "rack-attack", '~> 4.3.1'
# Ace editor
-gem 'ace-rails-ap', '~> 2.0.1'
diff --git a/debian/patches/0029-loosen-sass-rails.patch b/debian/patches/0029-loosen-sass-rails.patch
index a203b6a..2612e98 100644
--- a/debian/patches/0029-loosen-sass-rails.patch
+++ b/debian/patches/0029-loosen-sass-rails.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -183,7 +183,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
+@@ -189,7 +189,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.3'
diff --git a/debian/patches/0031-loosen-jquery-turbolinks.patch b/debian/patches/0031-loosen-jquery-turbolinks.patch
deleted file mode 100644
index bb90381..0000000
--- a/debian/patches/0031-loosen-jquery-turbolinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -187,7 +187,7 @@ gem "sass-rails", '~> 5.0.3'
- gem "coffee-rails", '~> 4.1.0'
- gem "uglifier", '~> 2.7.2'
- gem 'turbolinks', '~> 2.5.0'
--gem 'jquery-turbolinks', '~> 2.0.1'
-+gem 'jquery-turbolinks', '~> 2.1.0'
-
- gem 'addressable', '~> 2.3.8'
- gem 'bootstrap-sass', '~> 3.0'
diff --git a/debian/patches/0032-loosen-gon.patch b/debian/patches/0032-loosen-gon.patch
deleted file mode 100644
index ac126b4..0000000
--- a/debian/patches/0032-loosen-gon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -193,7 +193,7 @@ gem 'addressable', '~> 2.3.8'
- gem 'bootstrap-sass', '~> 3.0'
- gem 'font-awesome-rails', '~> 4.2'
- gem 'gitlab_emoji', '~> 0.1'
--gem 'gon', '~> 5.0.0'
-+gem 'gon', '~> 6.0.1'
- gem 'jquery-atwho-rails', '~> 1.3.2'
- gem 'jquery-rails', '~> 3.1.3'
- gem 'jquery-scrollto-rails', '~> 1.4.3'
diff --git a/debian/patches/0034-loosen-jquery-rails.patch b/debian/patches/0034-loosen-jquery-rails.patch
index 3db6fed..5b3e52a 100644
--- a/debian/patches/0034-loosen-jquery-rails.patch
+++ b/debian/patches/0034-loosen-jquery-rails.patch
@@ -2,8 +2,8 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -195,7 +195,7 @@ gem 'font-awesome-rails', '~> 4.2'
- gem 'gitlab_emoji', '~> 0.1'
+@@ -201,7 +201,7 @@ gem 'font-awesome-rails', '~> 4.2'
+ gem 'gitlab_emoji', '~> 0.2.0'
gem 'gon', '~> 6.0.1'
gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails', '~> 3.1.3'
diff --git a/debian/patches/0035-loosen-jquery-ui-rails.patch b/debian/patches/0035-loosen-jquery-ui-rails.patch
index 315b366..979bb44 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
-@@ -197,7 +197,7 @@ gem 'gon', '~> 6.0.1'
+@@ -203,7 +203,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/0037-loosen-request-store.patch b/debian/patches/0037-loosen-request-store.patch
index fed34bc..8443cf8 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
-@@ -200,7 +200,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
+@@ -206,7 +206,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'
@@ -10,8 +10,8 @@ Index: gitlab/Gemfile
+gem 'request_store', '~> 1.1'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'
-
-@@ -277,6 +277,11 @@ group :production do
+ gem 'net-ssh', '~> 3.0.1'
+@@ -286,6 +286,11 @@ group :production do
gem "gitlab_meta", '7.0'
end
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
deleted file mode 100644
index 519d723..0000000
--- a/debian/patches/0100-remove-development-test.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -204,87 +204,6 @@ gem 'request_store', '~> 1.1'
- gem 'select2-rails', '~> 3.5.9'
- gem 'virtus', '~> 1.0.1'
-
--group :development do
-- gem "foreman"
-- gem 'brakeman', '3.0.1', require: false
--
-- gem "annotate", "~> 2.6.0"
-- gem "letter_opener", '~> 1.1.2'
-- gem 'quiet_assets', '~> 1.0.2'
-- gem 'rerun', '~> 0.10.0'
-- gem 'bullet', require: false
-- gem 'rblineprof', platform: :mri, require: false
--
-- # Better errors handler
-- gem 'better_errors', '~> 1.0.1'
-- gem 'binding_of_caller', '~> 0.7.2'
--
-- # Docs generator
-- gem "sdoc", '~> 0.3.20'
--
-- # thin instead webrick
-- gem 'thin', '~> 1.6.1'
--end
--
--group :development, :test do
-- gem 'byebug', platform: :mri
-- gem 'pry-rails'
--
-- gem 'awesome_print', '~> 1.2.0'
-- gem 'fuubar', '~> 2.0.0'
--
-- gem 'database_cleaner', '~> 1.4.0'
-- gem 'factory_girl_rails', '~> 4.3.0'
-- gem 'rspec-rails', '~> 3.3.0'
-- gem 'spinach-rails', '~> 0.2.1'
--
-- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-- gem 'minitest', '~> 5.7.0'
--
-- # Generate Fake data
-- gem 'ffaker', '~> 2.0.0'
--
-- gem 'capybara', '~> 2.4.0'
-- gem 'capybara-screenshot', '~> 1.0.0'
-- gem 'poltergeist', '~> 1.6.0'
--
-- gem 'teaspoon', '~> 1.0.0'
-- gem 'teaspoon-jasmine', '~> 2.2.0'
--
-- gem 'spring', '~> 1.3.6'
-- gem 'spring-commands-rspec', '~> 1.0.4'
-- gem 'spring-commands-spinach', '~> 1.0.0'
-- gem 'spring-commands-teaspoon', '~> 0.0.2'
--
-- gem 'rubocop', '~> 0.28.0', require: false
-- gem 'coveralls', '~> 0.8.2', require: false
-- gem 'simplecov', '~> 0.10.0', require: false
-- gem 'flog', require: false
-- gem 'flay', require: false
--
-- gem 'benchmark-ips', require: false
--end
--
--group :test do
-- gem 'shoulda-matchers', '~> 2.8.0', require: false
-- gem 'email_spec', '~> 1.6.0'
-- gem 'webmock', '~> 1.21.0'
-- gem 'test_after_commit', '~> 0.2.2'
-- gem 'sham_rack'
--end
--
--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'
--
- gem 'octokit', '~> 3.7.0'
-
- gem "mail_room", "~> 0.6.1"
diff --git a/debian/patches/0102-loosen-octokit.patch b/debian/patches/0102-loosen-octokit.patch
index fa9be22..326bab1 100644
--- a/debian/patches/0102-loosen-octokit.patch
+++ b/debian/patches/0102-loosen-octokit.patch
@@ -2,9 +2,9 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -204,7 +204,7 @@ gem 'request_store', '~> 1.1'
- gem 'select2-rails', '~> 3.5.9'
- gem 'virtus', '~> 1.0.1'
+@@ -294,7 +294,7 @@ end
+ gem "newrelic_rpm", '~> 3.9.4.245'
+ gem 'newrelic-grape'
-gem 'octokit', '~> 3.7.0'
+gem 'octokit', '~> 3.7'
diff --git a/debian/patches/0107-relax-omniauth-facebook.patch b/debian/patches/0107-relax-omniauth-facebook.patch
index c5d58bd..495755c 100644
--- a/debian/patches/0107-relax-omniauth-facebook.patch
+++ b/debian/patches/0107-relax-omniauth-facebook.patch
@@ -2,8 +2,8 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -19,7 +19,7 @@ gem 'devise-async', '~> 0.9.0'
- gem 'doorkeeper', '~> 2.1'
+@@ -23,7 +23,7 @@ gem 'devise-async', '~> 0.9.0'
+ gem 'doorkeeper', '~> 2.2.0'
gem 'omniauth', '~> 1.2.2'
gem 'omniauth-bitbucket', '~> 0.0.2'
-gem 'omniauth-facebook', '~> 3.0.0'
diff --git a/debian/patches/0300-no-hard-coded-workhorse-path.patch b/debian/patches/0300-no-hard-coded-workhorse-path.patch
index aa8d4b7..4e0c13d 100644
--- a/debian/patches/0300-no-hard-coded-workhorse-path.patch
+++ b/debian/patches/0300-no-hard-coded-workhorse-path.patch
@@ -2,7 +2,7 @@ Index: gitlab/lib/support/init.d/gitlab
===================================================================
--- gitlab.orig/lib/support/init.d/gitlab
+++ gitlab/lib/support/init.d/gitlab
-@@ -237,7 +237,7 @@ start_gitlab() {
+@@ -238,7 +238,7 @@ start_gitlab() {
else
# No need to remove a socket, gitlab-workhorse does this itself
$app_root/bin/daemon_with_pidfile $gitlab_workhorse_pid_path \
diff --git a/debian/patches/loosen-rails-version.patch b/debian/patches/loosen-rails-version.patch
index 9c273ba..5a0d9ce 100644
--- a/debian/patches/loosen-rails-version.patch
+++ b/debian/patches/loosen-rails-version.patch
@@ -7,8 +7,8 @@ Index: gitlab/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
--gem 'rails', '4.1.12'
-+gem 'rails', '~> 4.2'
+-gem 'rails', '4.2.4'
++gem 'rails', '~> 4.2.4'
+ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
- # Specify a sprockets version due to security issue
- # See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
+ # Responders respond_to and respond_with
diff --git a/debian/patches/series b/debian/patches/series
index 1b3638d..32b592e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,30 +1,19 @@
loosen-rails-version.patch
0002-loosen-devise.patch
-0003-loosen-doorkeeper.patch
-0004-loosen-rack-oauth2.patch
0005-use-debian-omniauth-ldap.patch
-0013-loosen-enumerize.patch
0015-loosen-carrierwave.patch
0016-loosen-fog.patch
0017-loosen-redcarpet.patch
0018-loosen-rdoc.patch
-0019-loosen-creole.patch
0020-loosen-unicorn.patch
0021-loosen-sidekiq.patch
-0022-loosen-colorize.patch
-0025-loosen-asana.patch
0027-loosen-underscore-rails.patch
0028-loosen-ace-rails-ap.patch
0029-loosen-sass-rails.patch
-0031-loosen-jquery-turbolinks.patch
-0032-loosen-gon.patch
0034-loosen-jquery-rails.patch
0035-loosen-jquery-ui-rails.patch
0037-loosen-request-store.patch
-0100-remove-development-test.patch
0102-loosen-octokit.patch
-0106-loosen-gollum-lib.patch
0107-relax-omniauth-facebook.patch
-0200-rails-4.2.patch
source-init-functions.patch
0300-no-hard-coded-workhorse-path.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