svn commit: r455257 - in head/www/gitlab: . files
Remko Lodder
remko at FreeBSD.org
Fri Dec 1 18:14:11 UTC 2017
Thanks a lot!
> On 1 Dec 2017, at 12:03, Torsten Zuehlsdorff <tz at FreeBSD.org> wrote:
>
> Author: tz
> Date: Fri Dec 1 11:03:43 2017
> New Revision: 455257
> URL: https://svnweb.freebsd.org/changeset/ports/455257
>
> Log:
> www/gitlab: Fix options and update patches
>
> The last update broke the options and removed
> the needed gems from the Gemfile
>
> Also update patches which weren't committed last time
>
> Submitted by: Matthias Fechner <idefix at fechner.net>
> Reported by: remko
>
> 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
>
> Modified: head/www/gitlab/Makefile
> ==============================================================================
> --- 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 @@
>
> PORTNAME= gitlab
> PORTVERSION= 10.1.4
> +PORTREVISION= 1
> DISTVERSIONPREFIX= v
> CATEGORIES= www devel
>
> @@ -222,7 +223,6 @@ post-patch-MYSQL-off:
> ${REINPLACE_CMD} -e "/gem 'peek-mysql2'/d" ${WRKSRC}/Gemfile
>
> post-patch-PGSQL-on:
> - ${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile
> ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
>
> post-patch-PGSQL-off:
>
> Modified: head/www/gitlab/files/patch-Gemfile
> ==============================================================================
> --- 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'
>
> -gem 'rails', '4.2.8'
> @@ -15,11 +15,7 @@
>
> # 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'
>
> @@ -59,7 +55,7 @@
> gem 'akismet', '~> 2.0'
>
> # 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
>
> # Language detection
> @@ -68,7 +64,7 @@
>
> # 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'
>
> # HAML
> @@ -85,7 +81,7 @@
>
> # 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 @@
>
> # 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'
>
> # Markdown and HTML processing
> gem 'html-pipeline', '~> 1.11.0'
> @@ -138,7 +134,7 @@
>
> # 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 @@
>
> # 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'
>
> # Misc
>
> @@ -168,7 +164,7 @@
>
> # 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'
>
> # HipChat integration
> @@ -181,7 +177,7 @@
>
> # 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'
>
> # Kubernetes integration
> @@ -197,7 +193,7 @@
> gem 'babosa', '~> 1.0.2'
>
> # 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'
>
> # Protect against bruteforcing
> @@ -206,7 +202,7 @@
>
> # 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'
>
> gem 'webpack-rails', '~> 0.9.10'
> @@ -239,7 +235,7 @@
>
> gem 'premailer-rails', '~> 1.9.7'
>
> -@@ -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
>
> # 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', '>= 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'
>
> # Metrics
> group :metrics do
> @@ -383,7 +379,7 @@
>
> # 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
>
> # Gitaly GRPC client
> @@ -395,7 +391,7 @@
>
> # 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'
>
> Modified: head/www/gitlab/files/patch-config_gitlab.yml.example
> ==============================================================================
> --- 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 @@
>
> + ## Backup settings
> +@@ -548,12 +548,12 @@ production: &base
> +
> ## GitLab Shell settings
> gitlab_shell:
> - path: /home/git/gitlab-shell/
> @@ -27,7 +27,7 @@
>
> # 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:
>
> Modified: head/www/gitlab/files/patch-config_initializers_1__settings.rb
> ==============================================================================
> --- 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'] ||= Settings.__send__(:build_base_gitlab_url)
> Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url)
> Settings.gitlab['user'] ||= 'git'
> @@ -13,5 +13,5 @@
> +Settings.gitlab['user_home'] ||= '/usr/home/' + Settings.gitlab['user']
> +Settings.gitlab['time_zone'] ||= nil
> Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
> - Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
> + Settings.gitlab['password_authentication_enabled'] ||= true if Settings.gitlab['password_authentication_enabled'].nil?
> Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
>
> Modified: head/www/gitlab/files/patch-lib_gitlab_recaptcha.rb
> ==============================================================================
> --- 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|
>
> Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab
> ==============================================================================
> --- 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 @@
> }
>
> 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$ {
>
> Modified: head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
> ==============================================================================
> --- 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 @@
> }
>
> 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 at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20171201/8ae6b012/attachment-0001.sig>
More information about the svn-ports-all
mailing list