Date: Fri, 1 Dec 2017 19:14:05 +0100 From: Remko Lodder <remko@FreeBSD.org> To: Torsten Zuehlsdorff <tz@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r455257 - in head/www/gitlab: . files Message-ID: <F49E27CC-D491-4CCD-9CB3-F7992ACECBEA@FreeBSD.org> In-Reply-To: <201712011103.vB1B3hbg090029@repo.freebsd.org> References: <201712011103.vB1B3hbg090029@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_CF67FDFE-7A96-400A-9043-1D5B78E2B152 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Thanks a lot! > On 1 Dec 2017, at 12:03, Torsten Zuehlsdorff <tz@FreeBSD.org> wrote: >=20 > Author: tz > Date: Fri Dec 1 11:03:43 2017 > New Revision: 455257 > URL: https://svnweb.freebsd.org/changeset/ports/455257 >=20 > Log: > www/gitlab: Fix options and update patches >=20 > The last update broke the options and removed > the needed gems from the Gemfile >=20 > Also update patches which weren't committed last time >=20 > Submitted by: Matthias Fechner <idefix@fechner.net> > Reported by: remko >=20 > Modified: > head/www/gitlab/Makefile > head/www/gitlab/files/patch-Gemfile > head/www/gitlab/files/patch-config_gitlab.yml.example > head/www/gitlab/files/patch-config_initializers_1__settings.rb > head/www/gitlab/files/patch-lib_gitlab_recaptcha.rb > head/www/gitlab/files/patch-lib_support_nginx_gitlab > head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl >=20 > Modified: head/www/gitlab/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/www/gitlab/Makefile Fri Dec 1 10:22:15 2017 = (r455256) > +++ head/www/gitlab/Makefile Fri Dec 1 11:03:43 2017 = (r455257) > @@ -3,6 +3,7 @@ >=20 > PORTNAME=3D gitlab > PORTVERSION=3D 10.1.4 > +PORTREVISION=3D 1 > DISTVERSIONPREFIX=3D v > CATEGORIES=3D www devel >=20 > @@ -222,7 +223,6 @@ post-patch-MYSQL-off: > ${REINPLACE_CMD} -e "/gem 'peek-mysql2'/d" ${WRKSRC}/Gemfile >=20 > post-patch-PGSQL-on: > - ${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile > ${CP} ${WRKSRC}/config/database.yml.postgresql = ${WRKSRC}/config/database.yml.sample >=20 > post-patch-PGSQL-off: >=20 > Modified: head/www/gitlab/files/patch-Gemfile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/www/gitlab/files/patch-Gemfile Fri Dec 1 10:22:15 2017 = (r455256) > +++ head/www/gitlab/files/patch-Gemfile Fri Dec 1 11:03:43 2017 = (r455257) > @@ -1,6 +1,6 @@ > ---- Gemfile.orig 2017-10-31 20:21:48 UTC > +--- Gemfile.orig 2017-11-14 20:51:25 UTC > +++ Gemfile > -@@ -1,49 +1,47 @@ > +@@ -1,12 +1,12 @@ > source 'https://rubygems.org' >=20 > -gem 'rails', '4.2.8' > @@ -15,11 +15,7 @@ >=20 > # Default values for AR models > gem 'default_value_for', '~> 3.0.0' > - > - # Supported DBs > --gem 'mysql2', '~> 0.4.5', group: :mysql > --gem 'pg', '~> 0.18.2', group: :postgres > - > +@@ -18,32 +18,32 @@ gem 'pg', '~> 0.18.2', group: :postgres > gem 'rugged', '~> 0.26.0' > gem 'grape-route-helpers', '~> 2.1.0' >=20 > @@ -59,7 +55,7 @@ > gem 'akismet', '~> 2.0' >=20 > # Two-factor authentication > -@@ -73,7 +71,7 @@ gem 'gollum-lib', '~> 4.2', require: fal > +@@ -73,7 +73,7 @@ gem 'gollum-lib', '~> 4.2', require: fal > gem 'gollum-rugged_adapter', '~> 0.4.4', require: false >=20 > # Language detection > @@ -68,7 +64,7 @@ >=20 > # API > gem 'grape', '~> 1.0' > -@@ -87,13 +85,13 @@ gem 'hashie-forbidden_attributes' > +@@ -87,13 +87,13 @@ gem 'hashie-forbidden_attributes' > gem 'kaminari', '~> 1.0' >=20 > # HAML > @@ -85,7 +81,7 @@ >=20 > # for backups > gem 'fog-aws', '~> 1.4' > -@@ -102,10 +100,10 @@ gem 'fog-google', '~> 0.5' > +@@ -102,10 +102,10 @@ gem 'fog-google', '~> 0.5' > gem 'fog-local', '~> 0.3' > gem 'fog-openstack', '~> 0.1' > gem 'fog-rackspace', '~> 0.1.1' > @@ -98,7 +94,7 @@ >=20 > # for aws storage > gem 'unf', '~> 0.1.4' > -@@ -115,32 +113,32 @@ gem 'seed-fu', '~> 2.3.5' > +@@ -115,32 +115,32 @@ gem 'seed-fu', '~> 2.3.5' >=20 > # Markdown and HTML processing > gem 'html-pipeline', '~> 1.11.0' > @@ -138,7 +134,7 @@ >=20 > # Issue tags > gem 'acts-as-taggable-on', '~> 4.0' > -@@ -148,17 +146,17 @@ gem 'acts-as-taggable-on', '~> 4.0' > +@@ -148,17 +148,17 @@ gem 'acts-as-taggable-on', '~> 4.0' > # Background jobs > gem 'sidekiq', '~> 5.0' > gem 'sidekiq-cron', '~> 0.6.0' > @@ -159,7 +155,7 @@ >=20 > # GitLab settings > gem 'settingslogic', '~> 2.0.9' > -@@ -168,7 +166,7 @@ gem 're2', '~> 1.1.1' > +@@ -168,7 +168,7 @@ gem 're2', '~> 1.1.1' >=20 > # Misc >=20 > @@ -168,7 +164,7 @@ >=20 > # Cache > gem 'redis-rails', '~> 5.0.1' > -@@ -178,10 +176,10 @@ gem 'redis', '~> 3.2' > +@@ -178,10 +178,10 @@ gem 'redis', '~> 3.2' > gem 'connection_pool', '~> 2.0' >=20 > # HipChat integration > @@ -181,7 +177,7 @@ >=20 > # Flowdock integration > gem 'gitlab-flowdock-git-hook', '~> 1.0.1' > -@@ -199,13 +197,13 @@ gem 'asana', '~> 0.6.0' > +@@ -199,13 +199,13 @@ gem 'asana', '~> 0.6.0' > gem 'ruby-fogbugz', '~> 0.2.1' >=20 > # Kubernetes integration > @@ -197,7 +193,7 @@ > gem 'babosa', '~> 1.0.2' >=20 > # Sanitizes SVG input > -@@ -215,7 +213,7 @@ gem 'loofah', '~> 2.0.3' > +@@ -215,7 +215,7 @@ gem 'loofah', '~> 2.0.3' > gem 'licensee', '~> 8.7.0' >=20 > # Protect against bruteforcing > @@ -206,7 +202,7 @@ >=20 > # Ace editor > gem 'ace-rails-ap', '~> 4.1.0' > -@@ -234,25 +232,25 @@ gem 'chronic', '~> 0.10.2' > +@@ -234,25 +234,25 @@ gem 'chronic', '~> 0.10.2' > gem 'chronic_duration', '~> 0.10.6' >=20 > gem 'webpack-rails', '~> 0.9.10' > @@ -239,7 +235,7 @@ >=20 > gem 'premailer-rails', '~> 1.9.7' >=20 > -@@ -260,15 +258,14 @@ gem 'premailer-rails', '~> 1.9.7' > +@@ -260,7 +260,7 @@ gem 'premailer-rails', '~> 1.9.7' > gem 'ruby_parser', '~> 3.8', require: false > gem 'rails-i18n', '~> 4.0.9' > gem 'gettext_i18n_rails', '~> 1.8.0' > @@ -248,16 +244,16 @@ > gem 'gettext', '~> 3.2.2', require: false, group: :development >=20 > # Perf bar > - gem 'peek', '~> 1.0.1' > +@@ -268,7 +268,7 @@ gem 'peek', '~> 1.0.1' > gem 'peek-gc', '~> 0.0.2' > gem 'peek-host', '~> 1.0.0' > --gem 'peek-mysql2', '~> 1.1.0', group: :mysql > + gem 'peek-mysql2', '~> 1.1.0', group: :mysql > -gem 'peek-performance_bar', '~> 1.3.0' > +gem 'peek-performance_bar', '>=3D 1.3.0' > gem 'peek-pg', '~> 1.3.0', group: :postgres > gem 'peek-rblineprof', '~> 0.2.0' > gem 'peek-redis', '~> 1.2.0' > -@@ -276,119 +273,35 @@ gem 'peek-sidekiq', '~> 1.0.3' > +@@ -276,119 +276,35 @@ gem 'peek-sidekiq', '~> 1.0.3' >=20 > # Metrics > group :metrics do > @@ -383,7 +379,7 @@ >=20 > # Required for ED25519 SSH host key support > group :ed25519 do > -@@ -398,9 +311,9 @@ group :ed25519 do > +@@ -398,9 +314,9 @@ group :ed25519 do > end >=20 > # Gitaly GRPC client > @@ -395,7 +391,7 @@ >=20 > # Feature toggles > gem 'flipper', '~> 0.10.2' > -@@ -409,3 +322,6 @@ gem 'flipper-active_record', '~> 0.10.2' > +@@ -409,3 +325,6 @@ gem 'flipper-active_record', '~> 0.10.2' > # Structured logging > gem 'lograge', '~> 0.5' > gem 'grape_logging', '~> 1.7' >=20 > Modified: head/www/gitlab/files/patch-config_gitlab.yml.example > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/www/gitlab/files/patch-config_gitlab.yml.example Fri Dec = 1 10:22:15 2017 (r455256) > +++ head/www/gitlab/files/patch-config_gitlab.yml.example Fri Dec = 1 11:03:43 2017 (r455257) > @@ -1,6 +1,6 @@ > ---- config/gitlab.yml.example.orig 2017-10-27 14:35:20.003116000 = +0200 > -+++ config/gitlab.yml.example 2017-10-27 14:37:11.761497000 = +0200 > -@@ -519,8 +519,8 @@ > +--- config/gitlab.yml.example.orig 2017-11-14 20:51:25 UTC > ++++ config/gitlab.yml.example > +@@ -519,8 +519,8 @@ production: &base > # real path not the symlink. > storages: # You must have at least a `default` storage path. > default: > @@ -9,10 +9,10 @@ > + path: /usr/home/git/repositories/ > + gitaly_address: = unix:/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket # TCP = connections are supported too (e.g. tcp://host:port) > # gitaly_token: 'special token' # Optional: override global = gitaly.token for this storage. > - failure_count_threshold: 10 # number of failures before = stopping attempts > - failure_wait_time: 30 # Seconds after an access failure = before allowing access again > -@@ -553,12 +553,12 @@ >=20 > + ## Backup settings > +@@ -548,12 +548,12 @@ production: &base > + > ## GitLab Shell settings > gitlab_shell: > - path: /home/git/gitlab-shell/ > @@ -27,7 +27,7 @@ >=20 > # Git over HTTP > upload_pack: true > -@@ -579,7 +579,7 @@ > +@@ -574,7 +574,7 @@ production: &base > # CAUTION! > # Use the default values unless you really know what you are doing > git: >=20 > Modified: = head/www/gitlab/files/patch-config_initializers_1__settings.rb > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/www/gitlab/files/patch-config_initializers_1__settings.rb = Fri Dec 1 10:22:15 2017 (r455256) > +++ head/www/gitlab/files/patch-config_initializers_1__settings.rb = Fri Dec 1 11:03:43 2017 (r455257) > @@ -1,6 +1,6 @@ > ---- config/initializers/1_settings.rb.orig 2017-08-09 13:53:30 UTC > +--- config/initializers/1_settings.rb.orig 2017-11-14 20:51:25 UTC > +++ config/initializers/1_settings.rb > -@@ -216,12 +216,8 @@ Settings.gitlab['email_subject_suffix'] > +@@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix'] > Settings.gitlab['base_url'] ||=3D = Settings.__send__(:build_base_gitlab_url) > Settings.gitlab['url'] ||=3D = Settings.__send__(:build_gitlab_url) > Settings.gitlab['user'] ||=3D 'git' > @@ -13,5 +13,5 @@ > +Settings.gitlab['user_home'] ||=3D '/usr/home/' + = Settings.gitlab['user'] > +Settings.gitlab['time_zone'] ||=3D nil > Settings.gitlab['signup_enabled'] ||=3D true if = Settings.gitlab['signup_enabled'].nil? > - Settings.gitlab['signin_enabled'] ||=3D true if = Settings.gitlab['signin_enabled'].nil? > + Settings.gitlab['password_authentication_enabled'] ||=3D true if = Settings.gitlab['password_authentication_enabled'].nil? > Settings.gitlab['restricted_visibility_levels'] =3D = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, = Settings.gitlab['restricted_visibility_levels'], []) >=20 > Modified: head/www/gitlab/files/patch-lib_gitlab_recaptcha.rb > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/www/gitlab/files/patch-lib_gitlab_recaptcha.rb Fri Dec = 1 10:22:15 2017 (r455256) > +++ head/www/gitlab/files/patch-lib_gitlab_recaptcha.rb Fri Dec = 1 11:03:43 2017 (r455257) > @@ -1,6 +1,6 @@ > ---- lib/gitlab/recaptcha.rb.orig 2017-11-18 21:06:32 UTC > +--- lib/gitlab/recaptcha.rb.orig 2017-11-14 20:51:25 UTC > +++ lib/gitlab/recaptcha.rb > -@@ -3,8 +3,8 @@ module Gitlab > +@@ -5,8 +5,8 @@ module Gitlab > def self.load_configurations! > if current_application_settings.recaptcha_enabled > ::Recaptcha.configure do |config| >=20 > Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/www/gitlab/files/patch-lib_support_nginx_gitlab Fri Dec = 1 10:22:15 2017 (r455256) > +++ head/www/gitlab/files/patch-lib_support_nginx_gitlab Fri Dec = 1 11:03:43 2017 (r455257) > @@ -1,4 +1,4 @@ > ---- lib/support/nginx/gitlab.orig 2017-06-07 20:48:31 UTC > +--- lib/support/nginx/gitlab.orig 2017-11-14 20:51:25 UTC > +++ lib/support/nginx/gitlab > @@ -17,7 +17,7 @@ > ## See installation.md#using-https for additional HTTPS configuration = details. > @@ -9,7 +9,7 @@ > } >=20 > map $http_upgrade $connection_upgrade_gitlab { > -@@ -77,7 +77,7 @@ server { > +@@ -110,7 +110,7 @@ server { > error_page 502 /502.html; > error_page 503 /503.html; > location ~ ^/(404|422|500|502|503)\.html$ { >=20 > Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Fri Dec = 1 10:22:15 2017 (r455256) > +++ head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Fri Dec = 1 11:03:43 2017 (r455257) > @@ -1,4 +1,4 @@ > ---- lib/support/nginx/gitlab-ssl.orig 2017-06-07 20:48:31 UTC > +--- lib/support/nginx/gitlab-ssl.orig 2017-11-14 20:51:25 UTC > +++ lib/support/nginx/gitlab-ssl > @@ -21,7 +21,7 @@ > ## See installation.md#using-https for additional HTTPS configuration = details. > @@ -9,7 +9,7 @@ > } >=20 > map $http_upgrade $connection_upgrade_gitlab_ssl { > -@@ -125,7 +125,7 @@ server { > +@@ -160,7 +160,7 @@ server { > error_page 502 /502.html; > error_page 503 /503.html; > location ~ ^/(404|422|500|502|503)\.html$ { > _______________________________________________ > svn-ports-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > To unsubscribe, send any mail to = "svn-ports-all-unsubscribe@freebsd.org" --Apple-Mail=_CF67FDFE-7A96-400A-9043-1D5B78E2B152 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEUZm6tSR1fPPy/V/fqMPbslnzjLAFAlohm+0ACgkQqMPbslnz jLBhMRAAkSxVqGt1dkhYfpS/fSLCc9UNWUnJRXAGropLzvcoMlH5BHRQ+/oFr+IZ rSRSAOuH3SLVNwKRdmrJ/iCkrLz/CYLdnVa8bFHV3kd9ludVZa97A1MpwVSkFC4H M/3e4n/mBvd+FUObLAEuTPLkadobBLkK/6MTOMmbvGWBgNXYl7+h3NBEsWSSznZj 19jgAsMtry79QQuPEwaN6mN4yHRiNV+uXGaUv7zlplmfW+/d8Oei0CqU7vk/HB63 l02bRWdOqkhSANVxhBWDOBgAZC73DaEPueHq7xab/9D4QYV7BWvnjKwy0iP8ly6z zYw6MQdfgZ8qUBJJHVJgp0iltNg72ksWWADbZ6Q3AKTuNJzLecyvP6s8jSA7t+Oz xV65RQ5JK1xTXVA3Yocl4aWis2aaAhd44WdqxVu2CIVbUDL7SiTqmhs944FGToXw EYsXmRZY04yA5QBSiupTmzEFr6D4EQ9/+yaCnjZ6v0TDAiiXPN+X3cdWDEcuJu1Q tgwhFdI/ZPUTXVSEgIQc7ifGQ5q/kmyHyPkkhMHnHvOmTjcO47Q3q3UXEbDDi2HS Ryo1zECb/Z/+TLDS5ytYtjMcsSMh/CL1JRz8TAZ/yR4wM1iiP5M8SkJVMWLxhWM5 UJ7pjfyjy4gp31pMVucwg8dKwkCwgIvbqa55RZK7JubfoKK6gIA= =rd3q -----END PGP SIGNATURE----- --Apple-Mail=_CF67FDFE-7A96-400A-9043-1D5B78E2B152--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F49E27CC-D491-4CCD-9CB3-F7992ACECBEA>