[DRE-commits] [gitlab] 04/23: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Fri Jun 3 12:52:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository gitlab.
commit aa0c7c4f1f80b51144c4e9fbc19d9a8251783561
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Thu Jun 2 11:31:04 2016 +0530
refresh patches
---
debian/changelog | 1 +
debian/patches/0002-loosen-devise.patch | 15 ---------
debian/patches/0005-use-debian-omniauth-ldap.patch | 4 +--
debian/patches/0015-loosen-carrierwave.patch | 15 ---------
debian/patches/0016-loosen-fog.patch | 2 +-
debian/patches/0018-loosen-rdoc.patch | 2 +-
debian/patches/0020-loosen-unicorn.patch | 15 ---------
debian/patches/0028-loosen-ace-rails-ap.patch | 15 ---------
debian/patches/003-loosen-sprockets.patch | 8 ++---
debian/patches/0037-loosen-request-store.patch | 15 ---------
debian/patches/0038-relax-net-ssh.patch | 17 ----------
debian/patches/0040-relax-rails.patch | 14 --------
debian/patches/0041-relax-omniauth.patch | 15 ---------
debian/patches/0042-relax-grape-entity.patch | 2 +-
debian/patches/0050-relax-stable-libs.patch | 11 +------
debian/patches/0100-remove-development-test.patch | 38 ++++++++++++----------
debian/patches/0102-loosen-octokit.patch | 15 ---------
debian/patches/0108-make-mysql-optional.patch | 4 +--
debian/patches/0109-fix-coffee-script.patch | 37 ---------------------
debian/patches/fix-wiki.patch | 14 --------
debian/patches/series | 11 -------
21 files changed, 33 insertions(+), 237 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b28ae0f..6265a5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
gitlab (8.8.2+dfsg-1) UNRELEASED; urgency=medium
* New upstream release (Closes: #823290)
+ * Refresh patches
-- Pirate Praveen <praveen at debian.org> Thu, 02 Jun 2016 11:11:47 +0530
diff --git a/debian/patches/0002-loosen-devise.patch b/debian/patches/0002-loosen-devise.patch
deleted file mode 100644
index 0270ae2..0000000
--- a/debian/patches/0002-loosen-devise.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/issues/2740
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -18,7 +18,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql
- gem "pg", '~> 0.18.2', group: :postgres
-
- # Authentication libraries
--gem 'devise', '~> 3.5.4'
-+gem 'devise', '~> 3.5.2'
- gem 'devise-async', '~> 0.9.0'
- gem 'doorkeeper', '~> 2.2.0'
- gem 'omniauth', '~> 1.3.1'
diff --git a/debian/patches/0005-use-debian-omniauth-ldap.patch b/debian/patches/0005-use-debian-omniauth-ldap.patch
index 0e2b67f..ab7653a 100644
--- a/debian/patches/0005-use-debian-omniauth-ldap.patch
+++ b/debian/patches/0005-use-debian-omniauth-ldap.patch
@@ -5,7 +5,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -55,7 +55,7 @@ gem "gitlab_git", '~> 8.2'
+@@ -57,7 +57,7 @@ gem "gitlab_git", '~> 10.0'
# 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
@@ -13,4 +13,4 @@ Index: gitlab/Gemfile
+gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
# Git Wiki
- gem 'gollum-lib', '~> 4.1.0'
+ # Required manually in config/initializers/gollum.rb to control load order
diff --git a/debian/patches/0015-loosen-carrierwave.patch b/debian/patches/0015-loosen-carrierwave.patch
deleted file mode 100644
index 1f370e9..0000000
--- a/debian/patches/0015-loosen-carrierwave.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2805
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -75,7 +75,7 @@ gem "kaminari", "~> 0.16.3"
- gem "haml-rails", '~> 0.9.0'
-
- # Files attachments
--gem "carrierwave", '~> 0.9.0'
-+gem "carrierwave", '~> 0.10.0'
-
- # Drag and Drop UI
- gem 'dropzonejs-rails', '~> 0.7.1'
diff --git a/debian/patches/0016-loosen-fog.patch b/debian/patches/0016-loosen-fog.patch
index 656320a..8b0c1dc 100644
--- a/debian/patches/0016-loosen-fog.patch
+++ b/debian/patches/0016-loosen-fog.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -81,7 +81,7 @@ gem "carrierwave", '~> 0.10.0'
+@@ -85,7 +85,7 @@ gem "carrierwave", '~> 0.10.0'
gem 'dropzonejs-rails', '~> 0.7.1'
# for aws storage
diff --git a/debian/patches/0018-loosen-rdoc.patch b/debian/patches/0018-loosen-rdoc.patch
index b106d4d..258d5cf 100644
--- a/debian/patches/0018-loosen-rdoc.patch
+++ b/debian/patches/0018-loosen-rdoc.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -96,7 +96,7 @@ gem 'task_list', '~> 1.0.2', require
+@@ -100,7 +100,7 @@ gem 'task_list', '~> 1.0.2', require
gem 'github-markup', '~> 1.3.1'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.2.9'
diff --git a/debian/patches/0020-loosen-unicorn.patch b/debian/patches/0020-loosen-unicorn.patch
deleted file mode 100644
index 9afafea..0000000
--- a/debian/patches/0020-loosen-unicorn.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2820
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -112,7 +112,7 @@ gem 'diffy', '~> 3.0.3'
-
- # Application server
- group :unicorn do
-- gem "unicorn", '~> 4.8.2'
-+ gem "unicorn", '~> 4.8'
- gem 'unicorn-worker-killer', '~> 0.4.2'
- end
-
diff --git a/debian/patches/0028-loosen-ace-rails-ap.patch b/debian/patches/0028-loosen-ace-rails-ap.patch
deleted file mode 100644
index e20d7dd..0000000
--- a/debian/patches/0028-loosen-ace-rails-ap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2857
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -187,7 +187,7 @@ gem "loofah", "~> 2.0.3"
- gem "rack-attack", '~> 4.3.1'
-
- # Ace editor
--gem 'ace-rails-ap', '~> 2.0.1'
-+gem 'ace-rails-ap', '~> 3.0.3'
-
- # Keyboard shortcuts
- gem 'mousetrap-rails', '~> 1.4.6'
diff --git a/debian/patches/003-loosen-sprockets.patch b/debian/patches/003-loosen-sprockets.patch
index 0def2f5..7ecf873 100644
--- a/debian/patches/003-loosen-sprockets.patch
+++ b/debian/patches/003-loosen-sprockets.patch
@@ -6,10 +6,10 @@ Index: gitlab/Gemfile
+++ gitlab/Gemfile
@@ -8,7 +8,7 @@ gem 'responders', '~> 2.0'
- # Specify a sprockets version due to security issue
- # See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
--gem 'sprockets', '~> 2.12.3'
-+gem 'sprockets', '~> 3.3.0'
+ # Specify a sprockets version due to increased performance
+ # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
+-gem 'sprockets', '~> 3.6.0'
++gem 'sprockets', '~> 3.3'
# Default values for AR models
gem "default_value_for", "~> 3.0.0"
diff --git a/debian/patches/0037-loosen-request-store.patch b/debian/patches/0037-loosen-request-store.patch
deleted file mode 100644
index 63a2d10..0000000
--- a/debian/patches/0037-loosen-request-store.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -212,7 +212,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
- gem 'jquery-ui-rails', '~> 5.0.0'
- gem 'nprogress-rails', '~> 0.1.6.7'
- gem 'raphael-rails', '~> 2.1.2'
--gem 'request_store', '~> 1.2.0'
-+gem 'request_store', '~> 1.1'
- gem 'select2-rails', '~> 3.5.9'
- gem 'virtus', '~> 1.0.1'
- gem 'net-ssh', '~> 3.0.1'
diff --git a/debian/patches/0038-relax-net-ssh.patch b/debian/patches/0038-relax-net-ssh.patch
deleted file mode 100644
index 5a03a11..0000000
--- a/debian/patches/0038-relax-net-ssh.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Relax requirement on net-ssh
-Author: Pirate Praveen <praveen at debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -215,7 +215,7 @@ gem 'raphael-rails', '~> 2.1.2'
- gem 'request_store', '~> 1.1'
- gem 'select2-rails', '~> 3.5.9'
- gem 'virtus', '~> 1.0.1'
--gem 'net-ssh', '~> 3.0.1'
-+gem 'net-ssh', '>= 2.9.2'
-
- # Sentry integration
- gem 'sentry-raven', '~> 0.15'
diff --git a/debian/patches/0040-relax-rails.patch b/debian/patches/0040-relax-rails.patch
deleted file mode 100644
index d89dc84..0000000
--- a/debian/patches/0040-relax-rails.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-allow newer rails minor versions
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -1,6 +1,6 @@
- source "https://rubygems.org"
-
--gem 'rails', '4.2.5.2'
-+gem 'rails', '~> 4.2.5', '>= 4.2.5.2'
- gem 'rails-deprecated_sanitizer', '~> 1.0.3'
-
- # Responders respond_to and respond_with
diff --git a/debian/patches/0041-relax-omniauth.patch b/debian/patches/0041-relax-omniauth.patch
deleted file mode 100644
index 608f1e7..0000000
--- a/debian/patches/0041-relax-omniauth.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow newer minor releases of omniauth
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -21,7 +21,7 @@ gem "pg", '~> 0.18.2', group: :postgres
- gem 'devise', '~> 3.5.2'
- gem 'devise-async', '~> 0.9.0'
- gem 'doorkeeper', '~> 2.2.0'
--gem 'omniauth', '~> 1.3.1'
-+gem 'omniauth', '~> 1.3', '>= 1.3.1'
- gem 'omniauth-azure-oauth2', '~> 0.0.6'
- gem 'omniauth-bitbucket', '~> 0.0.2'
- gem 'omniauth-cas3', '~> 1.1.2'
diff --git a/debian/patches/0042-relax-grape-entity.patch b/debian/patches/0042-relax-grape-entity.patch
index 403f7d9..866d759 100644
--- a/debian/patches/0042-relax-grape-entity.patch
+++ b/debian/patches/0042-relax-grape-entity.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -65,7 +65,7 @@ gem "github-linguist", "~> 4.7.0", requi
+@@ -69,7 +69,7 @@ gem "github-linguist", "~> 4.7.0", requi
# API
gem 'grape', '~> 0.13.0'
diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index 8c9eb1a..bc74279 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -5,16 +5,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -30,7 +30,7 @@ gem 'omniauth-github', '~> 1.1.1'
- gem 'omniauth-gitlab', '~> 1.0.0'
- gem 'omniauth-google-oauth2', '~> 0.2.0'
- gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
--gem 'omniauth-saml', '~> 1.4.2'
-+gem 'omniauth-saml', '~> 1.4', '>= 1.4.2'
- gem 'omniauth-shibboleth', '~> 1.2.0'
- gem 'omniauth-twitter', '~> 1.2.0'
- gem 'omniauth_crowd', '~> 2.2.0'
-@@ -93,7 +93,7 @@ gem "seed-fu", '~> 2.3.5'
+@@ -97,7 +97,7 @@ gem "seed-fu", '~> 2.3.5'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index f74ef75..0f0742b 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -4,16 +4,15 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -228,83 +228,6 @@ group :metrics do
- gem 'connection_pool', '~> 2.0', require: false
+@@ -239,85 +239,6 @@ group :metrics do
+ gem 'influxdb', '~> 0.2', require: false
end
-group :development do
- gem "foreman"
-- gem 'brakeman', '~> 3.1.0', require: false
+- gem 'brakeman', '~> 3.2.0', require: false
-
-- gem "annotate", "~> 2.6.0"
-- gem "letter_opener", '~> 1.1.2'
+- gem 'letter_opener_web', '~> 1.3.0'
- gem 'quiet_assets', '~> 1.0.2'
- gem 'rerun', '~> 0.11.0'
- gem 'bullet', require: false
@@ -38,10 +37,12 @@ Index: gitlab/Gemfile
- gem 'awesome_print', '~> 1.2.0', require: false
- 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'
+- gem 'database_cleaner', '~> 1.4.0'
+- gem 'factory_girl_rails', '~> 4.6.0'
+- gem 'rspec-rails', '~> 3.4.0'
+- gem 'rspec-retry'
+- gem 'spinach-rails', '~> 0.2.1'
+- gem 'spinach-rerun-reporter', '~> 0.0.2'
-
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.7.0'
@@ -49,21 +50,22 @@ Index: gitlab/Gemfile
- # Generate Fake data
- gem 'ffaker', '~> 2.0.0'
-
-- gem 'capybara', '~> 2.4.0'
+- gem 'capybara', '~> 2.6.2'
- gem 'capybara-screenshot', '~> 1.0.0'
-- gem 'poltergeist', '~> 1.8.1'
+- gem 'poltergeist', '~> 1.9.0'
-
-- gem 'teaspoon', '~> 1.0.0'
+- gem 'teaspoon', '~> 1.1.0'
- gem 'teaspoon-jasmine', '~> 2.2.0'
-
-- gem 'spring', '~> 1.3.6'
+- gem 'spring', '~> 1.7.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
-- gem 'spring-commands-spinach', '~> 1.0.0'
+- gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'spring-commands-teaspoon', '~> 0.0.2'
-
-- gem 'rubocop', '~> 0.35.0', require: false
+- gem 'rubocop', '~> 0.38.0', require: false
+- gem 'scss_lint', '~> 0.47.0', require: false
- gem 'coveralls', '~> 0.8.2', require: false
-- gem 'simplecov', '~> 0.10.0', require: false
+- gem 'simplecov', '~> 0.11.0', require: false
- gem 'flog', require: false
- gem 'flay', require: false
- gem 'bundler-audit', require: false
@@ -85,6 +87,6 @@ Index: gitlab/Gemfile
-
-gem "newrelic_rpm", '~> 3.14'
-
- gem 'octokit', '~> 3.8.0'
+ gem 'octokit', '~> 4.3.0'
- gem "mail_room", "~> 0.6.1"
+ gem "mail_room", "~> 0.7"
diff --git a/debian/patches/0102-loosen-octokit.patch b/debian/patches/0102-loosen-octokit.patch
deleted file mode 100644
index 362e8aa..0000000
--- a/debian/patches/0102-loosen-octokit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2877
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -228,7 +228,7 @@ group :metrics do
- gem 'connection_pool', '~> 2.0', require: false
- end
-
--gem 'octokit', '~> 3.8.0'
-+gem 'octokit', '~> 3.8'
-
- gem "mail_room", "~> 0.6.1"
-
diff --git a/debian/patches/0108-make-mysql-optional.patch b/debian/patches/0108-make-mysql-optional.patch
index ca7b1d3..2257c6f 100644
--- a/debian/patches/0108-make-mysql-optional.patch
+++ b/debian/patches/0108-make-mysql-optional.patch
@@ -11,7 +11,7 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -14,8 +14,9 @@ gem 'sprockets', '~> 3.3.0'
+@@ -14,8 +14,9 @@ gem 'sprockets', '~> 3.3'
gem "default_value_for", "~> 3.0.0"
# Supported DBs
@@ -22,4 +22,4 @@ Index: gitlab/Gemfile
+gem "pg", '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
# Authentication libraries
- gem 'devise', '~> 3.5.2'
+ gem 'devise', '~> 3.5.4'
diff --git a/debian/patches/0109-fix-coffee-script.patch b/debian/patches/0109-fix-coffee-script.patch
deleted file mode 100644
index d9aaedd..0000000
--- a/debian/patches/0109-fix-coffee-script.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b2c641de219d3aba8f1fce758b2f05ca8233e2d6 Mon Sep 17 00:00:00 2001
-From: Marin Jankovski <maxlazio at gmail.com>
-Date: Fri, 26 Feb 2016 13:22:35 +0100
-Subject: [PATCH] Fix syntax error in autosave coffeescript.
-
----
- app/assets/javascripts/autosave.js.coffee | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/app/assets/javascripts/autosave.js.coffee b/app/assets/javascripts/autosave.js.coffee
-index 5d3fe81..28f8e10 100644
---- a/app/assets/javascripts/autosave.js.coffee
-+++ b/app/assets/javascripts/autosave.js.coffee
-@@ -16,11 +16,11 @@ class @Autosave
-
- try
- text = window.localStorage.getItem @key
-- catch
-+ catch e
- return
-
- @field.val text if text?.length > 0
-- @field.trigger "input"
-+ @field.trigger "input"
-
- save: ->
- return unless window.localStorage?
-@@ -35,5 +35,5 @@ class @Autosave
- reset: ->
- return unless window.localStorage?
-
-- try
-+ try
- window.localStorage.removeItem @key
---
-libgit2 0.24.0
-
diff --git a/debian/patches/fix-wiki.patch b/debian/patches/fix-wiki.patch
deleted file mode 100644
index b09dc8f..0000000
--- a/debian/patches/fix-wiki.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-revisit this after 8.6.3
-
-diff -ur a/app/models/wiki_page.rb b/app/models/wiki_page.rb
---- a/app/models/wiki_page.rb 2016-01-23 17:45:00.000000000 +0100
-+++ b/app/models/wiki_page.rb 2016-03-03 08:26:25.256512379 +0100
-@@ -62,7 +62,7 @@
- # The raw content of this page.
- def content
- @attributes[:content] ||= if @page
-- @page.raw_data
-+ @page.text_data
- end
- end
-
diff --git a/debian/patches/series b/debian/patches/series
index 8a527eb..a83ee26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,21 +1,10 @@
-0002-loosen-devise.patch
003-loosen-sprockets.patch
0005-use-debian-omniauth-ldap.patch
-0015-loosen-carrierwave.patch
0016-loosen-fog.patch
0018-loosen-rdoc.patch
-0020-loosen-unicorn.patch
-0028-loosen-ace-rails-ap.patch
-0037-loosen-request-store.patch
-0038-relax-net-ssh.patch
-0040-relax-rails.patch
-0041-relax-omniauth.patch
0042-relax-grape-entity.patch
0050-relax-stable-libs.patch
0100-remove-development-test.patch
-0102-loosen-octokit.patch
0108-make-mysql-optional.patch
-0109-fix-coffee-script.patch
source-init-functions.patch
pid-log-paths.patch
-fix-wiki.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