diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-01-02 15:22:49 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-01-02 15:22:49 +0000 |
| commit | 095033adf39bd01735aa5feb3283d3bbfbd26820 (patch) | |
| tree | 77ddc256872d86d0e6be19ad9a65e7e3d5cfbd66 /www/gitlab | |
| parent | 060ec48cb4b0db2aee04bfa7514eb24e5cd0def0 (diff) | |
| download | ports-095033adf39bd01735aa5feb3283d3bbfbd26820.tar.gz ports-095033adf39bd01735aa5feb3283d3bbfbd26820.zip | |
Notes
Diffstat (limited to 'www/gitlab')
| -rw-r--r-- | www/gitlab/Makefile | 3 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 18 |
2 files changed, 14 insertions, 7 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 18a4984a8dbc..d2a83a57a957 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 949c0321f1b8..c5f4c8aa87d7 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' |