[DRE-commits] [gitlab] 04/12: refresh patches

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Tue Sep 13 14:34:09 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 94ca29297a6b15cdb9faaf5fbdd90ef2d714ff6b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 13 18:27:13 2016 +0530

    refresh patches
---
 debian/patches/0005-use-debian-omniauth-ldap.patch |   8 +-
 debian/patches/0018-loosen-rdoc.patch              |   8 +-
 debian/patches/003-loosen-sprockets.patch          |  15 ---
 debian/patches/0042-relax-grape-entity.patch       |  10 +-
 debian/patches/0050-relax-stable-libs.patch        | 105 ++++++++++++---------
 debian/patches/0100-remove-development-test.patch  |  25 +++--
 debian/patches/0108-make-mysql-optional.patch      |   8 +-
 debian/patches/0200-use-jquery-for-jquery2.patch   |  34 ++-----
 debian/patches/052-relax-grape.patch               |  10 +-
 debian/patches/series                              |   1 -
 10 files changed, 103 insertions(+), 121 deletions(-)

diff --git a/debian/patches/0005-use-debian-omniauth-ldap.patch b/debian/patches/0005-use-debian-omniauth-ldap.patch
index d69dea4..c8d3e57 100644
--- a/debian/patches/0005-use-debian-omniauth-ldap.patch
+++ b/debian/patches/0005-use-debian-omniauth-ldap.patch
@@ -1,11 +1,9 @@
 Debian package contains gitlab patches
 Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13280
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -57,7 +57,7 @@ gem 'gitlab_git', '~> 10.3.2'
+--- a/Gemfile
++++ b/Gemfile
+@@ -58,7 +58,7 @@
  # 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/0018-loosen-rdoc.patch b/debian/patches/0018-loosen-rdoc.patch
index 86a7f95..cc8e493 100644
--- a/debian/patches/0018-loosen-rdoc.patch
+++ b/debian/patches/0018-loosen-rdoc.patch
@@ -1,10 +1,8 @@
 Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -108,7 +108,7 @@ gem 'task_list',     '~> 1.0.2', require
+--- a/Gemfile
++++ b/Gemfile
+@@ -109,7 +109,7 @@
  gem 'github-markup', '~> 1.4'
  gem 'redcarpet',     '~> 3.3.3'
  gem 'RedCloth',      '~> 4.3.2'
diff --git a/debian/patches/003-loosen-sprockets.patch b/debian/patches/003-loosen-sprockets.patch
deleted file mode 100644
index 404ec56..0000000
--- a/debian/patches/003-loosen-sprockets.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -8,7 +8,7 @@ gem 'responders', '~> 2.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/0042-relax-grape-entity.patch b/debian/patches/0042-relax-grape-entity.patch
index 866d759..2cdcb64 100644
--- a/debian/patches/0042-relax-grape-entity.patch
+++ b/debian/patches/0042-relax-grape-entity.patch
@@ -1,13 +1,11 @@
 allow newer grape-entity already in debian
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -69,7 +69,7 @@ gem "github-linguist", "~> 4.7.0", requi
+--- a/Gemfile
++++ b/Gemfile
+@@ -70,7 +70,7 @@
  
  # API
- gem 'grape',        '~> 0.13.0'
+ gem 'grape',        '~> 0.15.0'
 -gem 'grape-entity', '~> 0.4.2'
 +gem 'grape-entity', '~> 0.5.0'
  gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index 3697dd7..1082d6d 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -1,20 +1,24 @@
 We should be able to update minor versions of stable libs without breaking
 gitlab Gemfile
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -1,6 +1,6 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -1,18 +1,18 @@
  source 'https://rubygems.org'
  
--gem 'rails', '4.2.7'
-+gem 'rails', '~> 4.2.7'
- gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+-gem 'rails', '4.2.7.1'
+-gem 'rails-deprecated_sanitizer', '~> 1.0.3'
++gem 'rails', '~> 4.2.7', '>= 4.2.7.1'
++gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3'
  
  # Responders respond_to and respond_with
-@@ -11,7 +11,7 @@ gem 'responders', '~> 2.0'
- gem 'sprockets', '~> 3.3'
+ gem 'responders', '~> 2.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.6'
+ gem 'sprockets-es6'
  
  # Default values for AR models
 -gem 'default_value_for', '~> 3.0.0'
@@ -22,12 +26,14 @@ Index: gitlab/Gemfile
  
  # Supported DBs
  gem 'mysql2', '~> 0.3.16', group: :mysql
-@@ -20,21 +20,21 @@ gem 'pg', '~> 0.18.2', group: :postgres
+@@ -20,22 +20,22 @@
+ 
  # Authentication libraries
  gem 'devise',                 '~> 4.0'
- gem 'doorkeeper',             '~> 4.0'
+-gem 'doorkeeper',             '~> 4.2.0'
 -gem 'omniauth',               '~> 1.3.1'
 -gem 'omniauth-auth0',         '~> 1.4.1'
++gem 'doorkeeper',             '~> 4.2'
 +gem 'omniauth',               '~> 1.3', '>= 1.3.1'
 +gem 'omniauth-auth0',         '~> 1.4', '>= 1.4.1'
  gem 'omniauth-azure-oauth2',  '~> 0.0.6'
@@ -37,7 +43,7 @@ Index: gitlab/Gemfile
 -gem 'omniauth-github',        '~> 1.1.1'
 -gem 'omniauth-gitlab',        '~> 1.0.0'
 +gem 'omniauth-cas3',          '~> 1.1', '>= 1.1.2'
-+gem 'omniauth-facebook',      '~> 3.0'
++gem 'omniauth-facebook',      '>= 3.0', '< 5.0'
 +gem 'omniauth-github',        '~> 1.1', '>= 1.1.1'
 +gem 'omniauth-gitlab',        '~> 1.0'
  gem 'omniauth-google-oauth2', '~> 0.4.1'
@@ -55,7 +61,7 @@ Index: gitlab/Gemfile
  gem 'jwt'
  
  # Spam and anti-bot protection
-@@ -42,9 +42,9 @@ gem 'recaptcha', '~> 3.0', require: 'rec
+@@ -43,9 +43,9 @@
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
@@ -67,16 +73,22 @@ Index: gitlab/Gemfile
  gem 'u2f', '~> 0.2.1'
  
  # Browser detection
-@@ -52,7 +52,7 @@ gem 'browser', '~> 2.2'
+@@ -53,12 +53,12 @@
  
  # Extracting information from a git repository
  # Provide access to Gitlab::Git library
--gem 'gitlab_git', '~> 10.3.2'
-+gem 'gitlab_git', '~> 10.3'
+-gem 'gitlab_git', '~> 10.4.7'
++gem 'gitlab_git', '~> 10.4', '>= 10.4.7'
  
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
-@@ -65,7 +65,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
+ # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
+-gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
++gem 'omniauth-ldap', '~> 1.0', '>= 1.0.4', require: "omniauth-ldap"
+ 
+ # Git Wiki
+ # Required manually in config/initializers/gollum.rb to control load order
+@@ -66,7 +66,7 @@
  gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
  
  # Language detection
@@ -84,8 +96,17 @@ Index: gitlab/Gemfile
 +gem 'github-linguist', '~> 4.7', require: 'linguist'
  
  # API
- gem 'grape',        '~> 0.13.0'
-@@ -100,73 +100,73 @@ gem 'unf', '~> 0.1.4'
+ gem 'grape',        '~> 0.15.0'
+@@ -77,7 +77,7 @@
+ gem 'kaminari', '~> 0.17.0'
+ 
+ # HAML
+-gem 'hamlit', '~> 2.6.1'
++gem 'hamlit', '~> 2.6', '>= 2.6.1'
+ 
+ # Files attachments
+ gem 'carrierwave', '~> 0.10.0'
+@@ -101,79 +101,79 @@
  gem 'six', '~> 0.2.0'
  
  # Seed data
@@ -101,7 +122,7 @@ Index: gitlab/Gemfile
 -gem 'redcarpet',     '~> 3.3.3'
 -gem 'RedCloth',      '~> 4.3.2'
 +gem 'redcarpet',     '~> 3.3', '>= 3.3.3'
-+gem 'RedCloth',      '~> 4.2'
++gem 'RedCloth',      '~> 4.3', '>= 4.3.1'
  gem 'rdoc',          '~> 4.1'
  gem 'org-ruby',      '~> 0.9.12'
  gem 'creole',        '~> 0.5.0'
@@ -122,7 +143,7 @@ Index: gitlab/Gemfile
  # Application server
  group :unicorn do
 -  gem 'unicorn', '~> 4.9.0'
-+  gem 'unicorn', '>= 4.9.0'
++  gem 'unicorn', '>= 4.9'
    gem 'unicorn-worker-killer', '~> 0.4.2'
  end
  
@@ -156,8 +177,8 @@ Index: gitlab/Gemfile
  
  # Misc
  
--gem 'version_sorter', '~> 2.0.0'
-+gem 'version_sorter', '~> 2.0'
+-gem 'version_sorter', '~> 2.1.0'
++gem 'version_sorter', '~> 2.1'
  
  # Cache
 -gem 'redis-rails', '~> 4.0.0'
@@ -167,17 +188,15 @@ Index: gitlab/Gemfile
  gem 'redis', '~> 3.2'
  gem 'connection_pool', '~> 2.0'
  
- # Campfire integration
--gem 'tinder', '~> 1.10.0'
-+gem 'tinder', '~> 1.10'
- 
  # HipChat integration
 -gem 'hipchat', '~> 1.5.0'
 +gem 'hipchat', '~> 1.5'
  
  # Flowdock integration
- gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
-@@ -175,7 +175,7 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.
+-gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
++gem 'gitlab-flowdock-git-hook', '~> 1.0', '>= 1.0.1'
+ 
+ # Gemnasium integration
  gem 'gemnasium-gitlab-service', '~> 0.2'
  
  # Slack integration
@@ -186,7 +205,7 @@ Index: gitlab/Gemfile
  
  # Asana integration
  gem 'asana', '~> 0.4.0'
-@@ -184,29 +184,29 @@ gem 'asana', '~> 0.4.0'
+@@ -182,29 +182,29 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # d3
@@ -215,8 +234,8 @@ Index: gitlab/Gemfile
 +gem 'rack-attack', '~> 4.3', '>= 4.3.1'
  
  # Ace editor
--gem 'ace-rails-ap', '~> 4.0.2'
-+gem 'ace-rails-ap', '~> 4.0', '>= 4.0.2'
+-gem 'ace-rails-ap', '~> 4.1.0'
++gem 'ace-rails-ap', '~> 4.1'
  
  # Keyboard shortcuts
 -gem 'mousetrap-rails', '~> 1.4.6'
@@ -224,8 +243,8 @@ Index: gitlab/Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.3'
-@@ -214,30 +214,30 @@ gem 'charlock_holmes', '~> 0.7.3'
- # Parse duration
+@@ -213,30 +213,30 @@
+ gem 'chronic', '~> 0.10.2'
  gem 'chronic_duration', '~> 0.10.6'
  
 -gem 'sass-rails', '~> 5.0.0'
@@ -247,7 +266,7 @@ Index: gitlab/Gemfile
 +gem 'bootstrap-sass',     '~> 3.3'
 +gem 'font-awesome-rails', '~> 4.6', '>= 4.6.1'
  gem 'gemojione',          '~> 3.0'
--gem 'gon',                '~> 6.0.1'
+-gem 'gon',                '~> 6.1.0'
 -gem 'jquery-atwho-rails', '~> 1.3.2'
 -gem 'jquery-rails',       '~> 4.1.0'
 -gem 'jquery-ui-rails',    '~> 5.0.0'
@@ -255,9 +274,9 @@ Index: gitlab/Gemfile
 -gem 'select2-rails',      '~> 3.5.9'
 -gem 'virtus',             '~> 1.0.1'
 -gem 'net-ssh',            '~> 3.0.1'
-+gem 'gon',                '~> 6.0', '>= 6.0.1'
++gem 'gon',                '~> 6.1'
 +gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
-+gem 'jquery-rails',       '~> 4.1'
++gem 'jquery-rails',       '~> 4.0'
 +gem 'jquery-ui-rails',    '~> 5.0'
 +gem 'request_store',      '~> 1.3'
 +gem 'select2-rails',      '~> 3.5', '>= 3.5.9'
@@ -274,16 +293,17 @@ Index: gitlab/Gemfile
  
  # Metrics
  group :metrics do
-@@ -327,25 +327,25 @@ end
+@@ -327,7 +327,7 @@
  
- gem 'newrelic_rpm', '~> 3.14'
+ gem 'newrelic_rpm', '~> 3.16'
  
 -gem 'octokit', '~> 4.3.0'
 +gem 'octokit', '~> 4.3'
  
  gem 'mail_room', '~> 0.8'
  
- gem 'email_reply_parser', '~> 0.5.8'
+@@ -336,18 +336,18 @@
+ gem 'ruby-prof', '~> 0.15.9'
  
  ## CI
 -gem 'activerecord-session_store', '~> 1.0.0'
@@ -302,7 +322,6 @@ Index: gitlab/Gemfile
 +gem 'health_check', '~> 2.1'
  
  # System information
--gem 'vmstat', '~> 2.1.1'
+ gem 'vmstat', '~> 2.2'
 -gem 'sys-filesystem', '~> 1.1.6'
-+gem 'vmstat', '~> 2.1', '>= 2.1.1'
 +gem 'sys-filesystem', '~> 1.1', '>= 1.1.6'
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 739d0b2..c066d62 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -1,10 +1,8 @@
 Bundler will fail when it can't find these locally
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -246,87 +246,6 @@ group :metrics do
+--- a/Gemfile
++++ b/Gemfile
+@@ -245,96 +245,12 @@
    gem 'influxdb', '~> 0.2', require: false
  end
  
@@ -14,7 +12,7 @@ Index: gitlab/Gemfile
 -
 -  gem 'letter_opener_web', '~> 1.3.0'
 -  gem 'rerun', '~> 0.11.0'
--  gem 'bullet', '~> 5.0.0', require: false
+-  gem 'bullet', '~> 5.2.0', require: false
 -  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 -  gem 'web-console', '~> 2.0'
 -
@@ -36,7 +34,7 @@ Index: gitlab/Gemfile
 -  gem 'awesome_print', '~> 1.2.0', require: false
 -  gem 'fuubar', '~> 2.0.0'
 -
--  gem 'database_cleaner',   '~> 1.4.0'
+-  gem 'database_cleaner',   '~> 1.5.0'
 -  gem 'factory_girl_rails', '~> 4.6.0'
 -  gem 'rspec-rails',        '~> 3.5.0'
 -  gem 'rspec-retry',        '~> 0.4.5'
@@ -64,7 +62,7 @@ Index: gitlab/Gemfile
 -  gem 'rubocop', '~> 0.41.2', require: false
 -  gem 'rubocop-rspec', '~> 1.5.0', require: false
 -  gem 'scss_lint', '~> 0.47.0', require: false
--  gem 'simplecov', '~> 0.11.0', require: false
+-  gem 'simplecov', '0.12.0', require: false
 -  gem 'flog', '~> 4.3.2', require: false
 -  gem 'flay', '~> 2.6.1', require: false
 -  gem 'bundler-audit', '~> 0.5.0', require: false
@@ -78,6 +76,7 @@ Index: gitlab/Gemfile
 -group :test do
 -  gem 'shoulda-matchers', '~> 2.8.0', require: false
 -  gem 'email_spec', '~> 1.6.0'
+-  gem 'json-schema', '~> 2.6.2'
 -  gem 'webmock', '~> 1.21.0'
 -  gem 'test_after_commit', '~> 0.4.2'
 -  gem 'sham_rack', '~> 1.3.6'
@@ -87,8 +86,16 @@ Index: gitlab/Gemfile
 -  gem 'gitlab_meta', '7.0'
 -end
 -
--gem 'newrelic_rpm', '~> 3.14'
+-gem 'newrelic_rpm', '~> 3.16'
 -
  gem 'octokit', '~> 4.3'
  
  gem 'mail_room', '~> 0.8'
+ 
+ gem 'email_reply_parser', '~> 0.5.8'
+ 
+-gem 'ruby-prof', '~> 0.15.9'
+-
+ ## CI
+ gem 'activerecord-session_store', '~> 1.0'
+ gem 'nested_form', '~> 0.3.2'
diff --git a/debian/patches/0108-make-mysql-optional.patch b/debian/patches/0108-make-mysql-optional.patch
index 4415f22..8e4291c 100644
--- a/debian/patches/0108-make-mysql-optional.patch
+++ b/debian/patches/0108-make-mysql-optional.patch
@@ -7,11 +7,9 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
  Gemfile | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -14,8 +14,9 @@ gem 'sprockets', '~> 3.3'
+--- a/Gemfile
++++ b/Gemfile
+@@ -15,8 +15,9 @@
  gem 'default_value_for', '~> 3.0'
  
  # Supported DBs
diff --git a/debian/patches/0200-use-jquery-for-jquery2.patch b/debian/patches/0200-use-jquery-for-jquery2.patch
index b50ee5c..ba9d019 100644
--- a/debian/patches/0200-use-jquery-for-jquery2.patch
+++ b/debian/patches/0200-use-jquery-for-jquery2.patch
@@ -1,29 +1,11 @@
 jquery 1.x and 2.x use same api
 http://lists.alioth.debian.org/pipermail/pkg-javascript-devel/2015-September/011230.html
 
-Index: gitlab/app/assets/javascripts/application.js.coffee
-===================================================================
---- gitlab.orig/app/assets/javascripts/application.js.coffee
-+++ gitlab/app/assets/javascripts/application.js.coffee
-@@ -4,7 +4,7 @@
- # It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
- # the compiled file.
- #
--#= require jquery2
-+#= require jquery
- #= require jquery-ui/autocomplete
- #= require jquery-ui/datepicker
- #= require jquery-ui/draggable
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -227,7 +227,7 @@ gem 'font-awesome-rails', '~> 4.6', '>=
- gem 'gemojione',          '~> 3.0'
- gem 'gon',                '~> 6.0', '>= 6.0.1'
- gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
--gem 'jquery-rails',       '~> 4.1'
-+gem 'jquery-rails',       '~> 4.0'
- gem 'jquery-ui-rails',    '~> 5.0'
- gem 'request_store',      '~> 1.3'
- gem 'select2-rails',      '~> 3.5', '>= 3.5.9'
+--- a/app/assets/javascripts/application.js
++++ b/app/assets/javascripts/application.js
+@@ -1,4 +1,4 @@
+-/*= require jquery2 */
++/*= require jquery */
+ /*= require jquery-ui/autocomplete */
+ /*= require jquery-ui/datepicker */
+ /*= require jquery-ui/draggable */
diff --git a/debian/patches/052-relax-grape.patch b/debian/patches/052-relax-grape.patch
index 9f69b1a..8069d00 100644
--- a/debian/patches/052-relax-grape.patch
+++ b/debian/patches/052-relax-grape.patch
@@ -1,14 +1,12 @@
 https://gitlab.com/gitlab-org/gitlab-ce/issues/19670
 
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -69,7 +69,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.2',
+--- a/Gemfile
++++ b/Gemfile
+@@ -70,7 +70,7 @@
  gem 'github-linguist', '~> 4.7', require: 'linguist'
  
  # API
--gem 'grape',        '~> 0.13.0'
+-gem 'grape',        '~> 0.15.0'
 +gem 'grape',        '~> 0.16.0'
  gem 'grape-entity', '~> 0.5.0'
  gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
diff --git a/debian/patches/series b/debian/patches/series
index 80eb8bd..6fabe9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-003-loosen-sprockets.patch
 0005-use-debian-omniauth-ldap.patch
 0018-loosen-rdoc.patch
 0042-relax-grape-entity.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