Attachment 178532 Details for Bug 215787 – patch to fix gitlab with newer gems

[patch] patch to fix gitlab with newer gems

gitlab_gem_updates.diff (text/plain), 5.38 KB, created by Steve Wills on 2017-01-05 03:19:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2017-01-05 03:19:51 UTC

Size: 5.38 KB

patch

obsolete

>Index: www/gitlab/Makefile
>===================================================================
>--- www/gitlab/Makefile	(revision 430540)
>+++ www/gitlab/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	gitlab
> PORTVERSION=	8.11.11
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	www devel
> 
> MAINTAINER=	tz@FreeBSD.org
>@@ -133,7 +133,7 @@
> 	rubygem-gon>=6.1.0:www/rubygem-gon \
> 	rubygem-jquery-atwho-rails-rails4>=1.3.2:www/rubygem-jquery-atwho-rails-rails4 \
> 	rubygem-jquery-rails4>=4.1.0:www/rubygem-jquery-rails4 \
>-	rubygem-jquery-ui-rails-rails4>=5.0.0:www/rubygem-jquery-ui-rails-rails4 \
>+	rubygem-jquery-ui-rails5-rails4>=5.0.0:www/rubygem-jquery-ui-rails5-rails4 \
> 	rubygem-request_store>=1.3.0:devel/rubygem-request_store \
> 	rubygem-select2-rails>=3.5.9:www/rubygem-select2-rails \
> 	rubygem-virtus>=1.0.1:devel/rubygem-virtus \
>Index: www/gitlab/files/patch-Gemfile
>===================================================================
>--- www/gitlab/files/patch-Gemfile	(revision 430540)
>+++ www/gitlab/files/patch-Gemfile	(working copy)
>@@ -1,5 +1,5 @@
>---- Gemfile.orig	2016-11-09 05:10:18 UTC
>-+++ Gemfile
>+--- Gemfile.orig	2017-01-04 21:07:00.413929000 -0500
>++++ Gemfile	2017-01-04 21:06:45.052347000 -0500
> @@ -1,6 +1,6 @@
>  source 'https://rubygems.org'
>  
>@@ -27,12 +27,18 @@
>  
>  # Authentication libraries
>  gem 'devise',                 '~> 4.0'
>-@@ -30,12 +29,11 @@ gem 'omniauth-facebook',      '~> 3.0.0'
>+@@ -26,20 +25,19 @@ gem 'omniauth-auth0',         '~> 1.4.1'
>+ gem 'omniauth-azure-oauth2',  '~> 0.0.6'
>+ gem 'omniauth-bitbucket',     '~> 0.0.2'
>+ gem 'omniauth-cas3',          '~> 1.1.2'
>+-gem 'omniauth-facebook',      '~> 3.0.0'
>++gem 'omniauth-facebook',      '>= 3.0.0'
>  gem 'omniauth-github',        '~> 1.1.1'
>  gem 'omniauth-gitlab',        '~> 1.0.0'
>  gem 'omniauth-google-oauth2', '~> 0.4.1'
> -gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
>- gem 'omniauth-saml',          '~> 1.6.0'
>+-gem 'omniauth-saml',          '~> 1.6.0'
>++gem 'omniauth-saml',          '>= 1.6.0'
>  gem 'omniauth-shibboleth',    '~> 1.2.0'
>  gem 'omniauth-twitter',       '~> 1.2.0'
>  gem 'omniauth_crowd',         '~> 2.2.0'
>@@ -41,7 +47,12 @@
>  gem 'jwt'
>  
>  # Spam and anti-bot protection
>-@@ -66,11 +64,11 @@ gem 'gollum-lib', '~> 4.2', require: fal
>+-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
>++gem 'recaptcha', '>= 3.0', require: 'recaptcha/rails'
>+ gem 'akismet', '~> 2.0'
>+ 
>+ # Two-factor authentication
>+@@ -66,21 +64,21 @@ gem 'gollum-lib', '~> 4.2', require: fal
>  gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
>  
>  # Language detection
>@@ -56,9 +67,12 @@
>  gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
>  
>  # Pagination
>-@@ -80,7 +78,7 @@ gem 'kaminari', '~> 0.17.0'
>- gem 'hamlit', '~> 2.6.1'
>+ gem 'kaminari', '~> 0.17.0'
>  
>+ # HAML
>+-gem 'hamlit', '~> 2.6.1'
>++gem 'hamlit', '>= 2.6.1'
>+ 
>  # Files attachments
> -gem 'carrierwave', '~> 0.10.0'
> +gem 'carrierwave', '>= 0.10.0'
>@@ -65,9 +79,12 @@
>  
>  # Drag and Drop UI
>  gem 'dropzonejs-rails', '~> 0.7.1'
>-@@ -109,10 +107,10 @@ gem 'task_list',     '~> 1.0.2', require
>+@@ -107,25 +105,25 @@ 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.4'
>- gem 'redcarpet',     '~> 3.3.3'
>+-gem 'redcarpet',     '~> 3.3.3'
>++gem 'redcarpet',     '>= 3.3.3'
>  gem 'RedCloth',      '~> 4.3.2'
> -gem 'rdoc',          '~>3.6'
> +gem 'rdoc',          '>= 3.6'
>@@ -78,8 +95,10 @@
>  gem 'asciidoctor',   '~> 1.5.2'
>  gem 'rouge',         '~> 2.0'
>  
>-@@ -121,11 +119,11 @@ gem 'rouge',         '~> 2.0'
>- gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
>+ # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
>+ # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
>+-gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
>++gem 'nokogiri', '>= 1.6.7.2'
>  
>  # Diffs
> -gem 'diffy', '~> 3.0.3'
>@@ -135,7 +154,7 @@
>  
>  # Ace editor
>  gem 'ace-rails-ap', '~> 4.1.0'
>-@@ -215,22 +213,22 @@ gem 'chronic_duration', '~> 0.10.6'
>+@@ -215,125 +213,42 @@ gem 'chronic_duration', '~> 0.10.6'
>  
>  gem 'sass-rails', '~> 5.0.0'
>  gem 'coffee-rails', '~> 4.1.0'
>@@ -147,7 +166,8 @@
> -gem 'addressable',        '~> 2.3.8'
> +gem 'addressable',        '>= 2.3.8'
>  gem 'bootstrap-sass',     '~> 3.3.0'
>- gem 'font-awesome-rails', '~> 4.6.1'
>+-gem 'font-awesome-rails', '~> 4.6.1'
>++gem 'font-awesome-rails', '>= 4.6.1'
>  gem 'gemojione',          '~> 3.0'
>  gem 'gon',                '~> 6.1.0'
>  gem 'jquery-atwho-rails', '~> 1.3.2'
>@@ -163,7 +183,8 @@
>  gem 'base32',             '~> 0.3.0'
>  
>  # Sentry integration
>-@@ -238,89 +236,6 @@ gem 'sentry-raven', '~> 2.0.0'
>+-gem 'sentry-raven', '~> 2.0.0'
>++gem 'sentry-raven', '>= 2.0.0'
>  
>  gem 'premailer-rails', '~> 1.9.0'
>  
>@@ -253,9 +274,28 @@
>  group :production do
>    gem 'gitlab_meta', '7.0'
>  end
>-@@ -349,5 +264,7 @@ gem 'paranoia', '~> 2.0'
>- gem 'health_check', '~> 2.1.0'
>  
>+ gem 'newrelic_rpm', '~> 3.16'
>+ 
>+-gem 'octokit', '~> 4.3.0'
>++gem 'octokit', '>= 4.3.0'
>+ 
>+ gem 'mail_room', '~> 0.8'
>+ 
>+ gem 'email_reply_parser', '~> 0.5.8'
>+ 
>+-gem 'ruby-prof', '~> 0.15.9'
>++gem 'ruby-prof', '>= 0.15.9'
>+ 
>+ ## CI
>+ gem 'activerecord-session_store', '~> 1.0.0'
>+@@ -346,8 +261,10 @@ gem 'oauth2', '~> 1.2.0'
>+ gem 'paranoia', '~> 2.0'
>+ 
>+ # Health check
>+-gem 'health_check', '~> 2.1.0'
>++gem 'health_check', '>= 2.1.0'
>+ 
>  # System information
> -gem 'vmstat', '~> 2.2'
> +gem 'vmstat', '>= 2.1.1'

Actions: View | Diff

Attachments on bug 215787: 178532 | 178687 | 178762