FreeBSD Bugzilla – Attachment 189333 Details for
Bug 224836
www/gitlab fix Gemfile for updated dependencies
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Fixed Gemfile issues.
www_gitlab_fix_gem_updates.patch (text/plain), 5.76 KB, created by
Matthias Fechner
on 2018-01-02 11:02:23 UTC
(
hide
)
Description:
Fixed Gemfile issues.
Filename:
MIME Type:
Creator:
Matthias Fechner
Created:
2018-01-02 11:02:23 UTC
Size:
5.76 KB
patch
obsolete
>diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile >index fc5c13ddf88..9ad91659e48 100644 >--- a/www/gitlab/Makefile >+++ b/www/gitlab/Makefile >@@ -4,7 +4,7 @@ > PORTNAME= gitlab > PORTVERSION= 10.1.5 > DISTVERSIONPREFIX= v >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= www devel > > MAINTAINER= idefix@fechner.net >@@ -253,3 +253,4 @@ do-install: > (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) > > .include <bsd.port.mk> >+ >diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile >index 949c0321f1b..c5f4c8aa87d 100644 >--- a/www/gitlab/files/patch-Gemfile >+++ b/www/gitlab/files/patch-Gemfile >@@ -1,4 +1,4 @@ >---- Gemfile.orig 2017-11-14 20:51:25 UTC >+--- Gemfile.orig 2017-12-07 12:02:52 UTC > +++ Gemfile > @@ -1,49 +1,49 @@ > source 'https://rubygems.org' >@@ -33,8 +33,9 @@ > gem 'doorkeeper', '~> 4.2.0' > gem 'doorkeeper-openid_connect', '~> 1.2.0' > -gem 'omniauth', '~> 1.4.2' >+-gem 'omniauth-auth0', '~> 1.4.1' > +gem 'omniauth', '>= 1.4.2' >- gem 'omniauth-auth0', '~> 1.4.1' >++gem 'omniauth-auth0', '>= 1.4.1' > gem 'omniauth-azure-oauth2', '~> 0.0.9' > gem 'omniauth-cas3', '~> 1.1.4' > gem 'omniauth-facebook', '~> 4.0.0' >@@ -44,9 +45,10 @@ > +gem 'omniauth-google-oauth2', '>= 0.5.2' > gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos > gem 'omniauth-oauth2-generic', '~> 0.2.2' >- gem 'omniauth-saml', '~> 1.7.0' >+-gem 'omniauth-saml', '~> 1.7.0' > -gem 'omniauth-shibboleth', '~> 1.2.0' > -gem 'omniauth-twitter', '~> 1.2.0' >++gem 'omniauth-saml', '>= 1.7.0' > +gem 'omniauth-shibboleth', '>= 1.2.0' > +gem 'omniauth-twitter', '>= 1.2.0' > gem 'omniauth_crowd', '~> 2.2.0' >@@ -183,7 +185,7 @@ > > # Flowdock integration > gem 'gitlab-flowdock-git-hook', '~> 1.0.1' >-@@ -199,13 +199,13 @@ gem 'asana', '~> 0.6.0' >+@@ -199,23 +199,23 @@ gem 'asana', '~> 0.6.0' > gem 'ruby-fogbugz', '~> 0.2.1' > > # Kubernetes integration >@@ -199,8 +201,12 @@ > gem 'babosa', '~> 1.0.2' > > # Sanitizes SVG input >-@@ -215,7 +215,7 @@ gem 'loofah', '~> 2.0.3' >- gem 'licensee', '~> 8.7.0' >+-gem 'loofah', '~> 2.0.3' >++gem 'loofah', '>= 2.0.3' >+ >+ # Working with license >+-gem 'licensee', '~> 8.7.0' >++gem 'licensee', '>= 8.7.0' > > # Protect against bruteforcing > -gem 'rack-attack', '~> 4.4.1' >diff --git a/www/gitlab/files/patch-config_database.yml.postgresql b/www/gitlab/files/patch-config_database.yml.postgresql >index 352b21431b4..eacc94225a2 100644 >--- a/www/gitlab/files/patch-config_database.yml.postgresql >+++ b/www/gitlab/files/patch-config_database.yml.postgresql >@@ -1,4 +1,4 @@ >---- config/database.yml.postgresql.orig 2017-11-14 20:51:25 UTC >+--- config/database.yml.postgresql.orig 2017-12-07 12:02:52 UTC > +++ config/database.yml.postgresql > @@ -6,7 +6,7 @@ production: > encoding: unicode >diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example >index 63207b2b1f1..53f3a9b3852 100644 >--- a/www/gitlab/files/patch-config_gitlab.yml.example >+++ b/www/gitlab/files/patch-config_gitlab.yml.example >@@ -1,4 +1,4 @@ >---- config/gitlab.yml.example.orig 2017-11-14 20:51:25 UTC >+--- config/gitlab.yml.example.orig 2017-12-07 12:02:52 UTC > +++ config/gitlab.yml.example > @@ -519,8 +519,8 @@ production: &base > # real path not the symlink. >diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb >index 2273256c3e6..1fa396110c4 100644 >--- a/www/gitlab/files/patch-config_initializers_1__settings.rb >+++ b/www/gitlab/files/patch-config_initializers_1__settings.rb >@@ -1,4 +1,4 @@ >---- config/initializers/1_settings.rb.orig 2017-11-14 20:51:25 UTC >+--- config/initializers/1_settings.rb.orig 2017-12-07 12:02:52 UTC > +++ config/initializers/1_settings.rb > @@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix'] > Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) >diff --git a/www/gitlab/files/patch-config_unicorn.rb.example b/www/gitlab/files/patch-config_unicorn.rb.example >index 89953fd6741..4da74f31089 100644 >--- a/www/gitlab/files/patch-config_unicorn.rb.example >+++ b/www/gitlab/files/patch-config_unicorn.rb.example >@@ -1,4 +1,4 @@ >---- config/unicorn.rb.example.orig 2017-06-07 20:58:14 UTC >+--- config/unicorn.rb.example.orig 2017-12-07 12:02:52 UTC > +++ config/unicorn.rb.example > @@ -33,12 +33,12 @@ worker_processes 3 > >diff --git a/www/gitlab/files/patch-lib_gitlab_recaptcha.rb b/www/gitlab/files/patch-lib_gitlab_recaptcha.rb >index 17f5ce29d89..5dbf31bf47b 100644 >--- a/www/gitlab/files/patch-lib_gitlab_recaptcha.rb >+++ b/www/gitlab/files/patch-lib_gitlab_recaptcha.rb >@@ -1,4 +1,4 @@ >---- lib/gitlab/recaptcha.rb.orig 2017-11-14 20:51:25 UTC >+--- lib/gitlab/recaptcha.rb.orig 2017-12-07 12:02:52 UTC > +++ lib/gitlab/recaptcha.rb > @@ -5,8 +5,8 @@ module Gitlab > def self.load_configurations! >diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab b/www/gitlab/files/patch-lib_support_nginx_gitlab >index 4a43b212311..3ada32e494f 100644 >--- a/www/gitlab/files/patch-lib_support_nginx_gitlab >+++ b/www/gitlab/files/patch-lib_support_nginx_gitlab >@@ -1,4 +1,4 @@ >---- lib/support/nginx/gitlab.orig 2017-11-14 20:51:25 UTC >+--- lib/support/nginx/gitlab.orig 2017-12-07 12:02:52 UTC > +++ lib/support/nginx/gitlab > @@ -17,7 +17,7 @@ > ## See installation.md#using-https for additional HTTPS configuration details. >diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl >index d64345f07fb..2ef1efbaf6b 100644 >--- a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl >+++ b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl >@@ -1,4 +1,4 @@ >---- lib/support/nginx/gitlab-ssl.orig 2017-11-14 20:51:25 UTC >+--- lib/support/nginx/gitlab-ssl.orig 2017-12-07 12:02:52 UTC > +++ lib/support/nginx/gitlab-ssl > @@ -21,7 +21,7 @@ > ## See installation.md#using-https for additional HTTPS configuration details.
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 224836
:
189332
|
189333
|
189336
|
189338