[DRE-commits] [gitlab] 03/05: refresh patches

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Thu Jan 14 13:43:49 UTC 2016 

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master-8.4
in repository gitlab.

commit cfeda7f743344de4dd28210ee3e740b8c1ff1fad
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jan 14 19:01:28 2016 +0530

    refresh patches
---
 debian/patches/0005-use-debian-omniauth-ldap.patch |  2 +-
 debian/patches/0015-loosen-carrierwave.patch       |  2 +-
 debian/patches/0016-loosen-fog.patch               |  6 ++--
 debian/patches/0017-loosen-redcarpet.patch         |  2 +-
 debian/patches/0018-loosen-rdoc.patch              |  2 +-
 debian/patches/0020-loosen-unicorn.patch           |  2 +-
 debian/patches/0027-loosen-underscore-rails.patch  | 13 --------
 debian/patches/0028-loosen-ace-rails-ap.patch      |  2 +-
 debian/patches/0029-loosen-sass-rails.patch        | 13 --------
 debian/patches/0034-loosen-jquery-rails.patch      | 13 --------
 debian/patches/0035-loosen-jquery-ui-rails.patch   | 35 ----------------------
 debian/patches/0037-loosen-request-store.patch     |  4 +--
 debian/patches/series                              |  4 ---
 13 files changed, 11 insertions(+), 89 deletions(-)

diff --git a/debian/patches/0005-use-debian-omniauth-ldap.patch b/debian/patches/0005-use-debian-omniauth-ldap.patch
index a8be25e..ed67b3a 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
-@@ -49,7 +49,7 @@ gem "gitlab_git", '~> 7.2.20'
+@@ -54,7 +54,7 @@ gem "gitlab_git", '~> 7.2.22'
  # 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/0015-loosen-carrierwave.patch b/debian/patches/0015-loosen-carrierwave.patch
index e1b46ff..f1ab435 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
-@@ -73,7 +73,7 @@ gem "kaminari", "~> 0.16.3"
+@@ -74,7 +74,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 875546c..3e51c84 100644
--- a/debian/patches/0016-loosen-fog.patch
+++ b/debian/patches/0016-loosen-fog.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -79,7 +79,7 @@ gem "carrierwave", '~> 0.10.0'
+@@ -80,7 +80,7 @@ gem "carrierwave", '~> 0.10.0'
  gem 'dropzonejs-rails', '~> 0.7.1'
  
  # for aws storage
--gem "fog", "~> 1.25.0"
-+gem "fog", "~> 1.25"
+-gem "fog", "~> 1.36.0"
++gem "fog", "~> 1.34"
  gem "unf", '~> 0.1.4'
  
  # Authorization
diff --git a/debian/patches/0017-loosen-redcarpet.patch b/debian/patches/0017-loosen-redcarpet.patch
index 46ef308..4a15d34 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
-@@ -92,7 +92,7 @@ gem "seed-fu", '~> 2.3.5'
+@@ -93,7 +93,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 73ab283..5985961 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
-@@ -94,7 +94,7 @@ gem 'task_list',     '~> 1.0.2', require
+@@ -95,7 +95,7 @@ gem 'task_list',     '~> 1.0.2', require
  gem 'github-markup', '~> 1.3.1'
  gem 'redcarpet',     '~> 3.3.2'
  gem 'RedCloth',      '~> 4.2.9'
diff --git a/debian/patches/0020-loosen-unicorn.patch b/debian/patches/0020-loosen-unicorn.patch
index fc95ae9..27421f1 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
-@@ -109,7 +109,7 @@ gem 'diffy', '~> 3.0.3'
+@@ -110,7 +110,7 @@ gem 'diffy', '~> 3.0.3'
  
  # Application server
  group :unicorn do
diff --git a/debian/patches/0027-loosen-underscore-rails.patch b/debian/patches/0027-loosen-underscore-rails.patch
deleted file mode 100644
index 493a884..0000000
--- a/debian/patches/0027-loosen-underscore-rails.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -171,7 +171,7 @@ gem 'd3_rails', '~> 3.5.5'
- gem "cal-heatmap-rails", "~> 0.0.1"
- 
- # underscore-rails
--gem "underscore-rails", "~> 1.4.4"
-+gem "underscore-rails", "~> 1.8.2"
- 
- # Sanitize user input
- gem "sanitize", '~> 2.0'
diff --git a/debian/patches/0028-loosen-ace-rails-ap.patch b/debian/patches/0028-loosen-ace-rails-ap.patch
index 25a7490..cc33f58 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
-@@ -181,7 +181,7 @@ gem 'babosa', '~> 1.0.2'
+@@ -182,7 +182,7 @@ gem 'babosa', '~> 1.0.2'
  gem "rack-attack", '~> 4.3.1'
  
  # Ace editor
diff --git a/debian/patches/0029-loosen-sass-rails.patch b/debian/patches/0029-loosen-sass-rails.patch
deleted file mode 100644
index 2612e98..0000000
--- a/debian/patches/0029-loosen-sass-rails.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -189,7 +189,7 @@ gem 'mousetrap-rails', '~> 1.4.6'
- # Detect and convert string character encoding
- gem 'charlock_holmes', '~> 0.7.3'
- 
--gem "sass-rails", '~> 4.0.5'
-+gem "sass-rails", '~> 5.0.3'
- gem "coffee-rails", '~> 4.1.0'
- gem "uglifier", '~> 2.7.2'
- gem 'turbolinks', '~> 2.5.0'
diff --git a/debian/patches/0034-loosen-jquery-rails.patch b/debian/patches/0034-loosen-jquery-rails.patch
deleted file mode 100644
index 5b3e52a..0000000
--- a/debian/patches/0034-loosen-jquery-rails.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -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'
-+gem 'jquery-rails',       '~> 4.0.4'
- gem 'jquery-scrollto-rails', '~> 1.4.3'
- gem 'jquery-ui-rails',    '~> 4.2.1'
- gem 'nprogress-rails',    '~> 0.1.6.7'
diff --git a/debian/patches/0035-loosen-jquery-ui-rails.patch b/debian/patches/0035-loosen-jquery-ui-rails.patch
deleted file mode 100644
index 979bb44..0000000
--- a/debian/patches/0035-loosen-jquery-ui-rails.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -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'
--gem 'jquery-ui-rails',    '~> 4.2.1'
-+gem 'jquery-ui-rails',    '~> 5.0.5'
- gem 'nprogress-rails',    '~> 0.1.6.7'
- gem 'raphael-rails',      '~> 2.1.2'
- gem 'request_store',      '~> 1.2.0'
-Index: gitlab/app/assets/stylesheets/application.scss
-===================================================================
---- gitlab.orig/app/assets/stylesheets/application.scss
-+++ gitlab/app/assets/stylesheets/application.scss
-@@ -2,8 +2,8 @@
-  * This is a manifest file that'll automatically include all the stylesheets available in this directory
-  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
-  * the top of the compiled file, but it's generally better to create a new file per style scope.
-- *= require jquery.ui.datepicker
-- *= require jquery.ui.autocomplete
-+ *= require jquery-ui/datepicker
-+ *= require jquery-ui/autocomplete
-  *= require jquery.atwho
-  *= require select2
-  *= require_self
-@@ -48,4 +48,4 @@
- /*
-  * Styles for JS behaviors.
-  */
-- at import "behaviors.scss";
-\ No newline at end of file
-+ at import "behaviors.scss";
diff --git a/debian/patches/0037-loosen-request-store.patch b/debian/patches/0037-loosen-request-store.patch
index 81502ba..1ce124d 100644
--- a/debian/patches/0037-loosen-request-store.patch
+++ b/debian/patches/0037-loosen-request-store.patch
@@ -2,8 +2,8 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -206,7 +206,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
- gem 'jquery-ui-rails',    '~> 5.0.5'
+@@ -207,7 +207,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'
diff --git a/debian/patches/series b/debian/patches/series
index debcb55..b9c3be3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,11 +7,7 @@ loosen-rails-version.patch
 0017-loosen-redcarpet.patch
 0018-loosen-rdoc.patch
 0020-loosen-unicorn.patch
-0027-loosen-underscore-rails.patch
 0028-loosen-ace-rails-ap.patch
-0029-loosen-sass-rails.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

-- 
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