Date: Tue, 10 Dec 2019 20:50:34 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519777 - in head/www/gitlab-ce: . files Message-ID: <201912102050.xBAKoYJI034381@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Tue Dec 10 20:50:33 2019 New Revision: 519777 URL: https://svnweb.freebsd.org/changeset/ports/519777 Log: Fixed problem with upgraded rails 5.2.4 version. Modified: head/www/gitlab-ce/Makefile head/www/gitlab-ce/files/patch-Gemfile head/www/gitlab-ce/files/patch-config_gitlab.yml.example head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Tue Dec 10 20:07:30 2019 (r519776) +++ head/www/gitlab-ce/Makefile Tue Dec 10 20:50:33 2019 (r519777) @@ -3,7 +3,7 @@ PORTNAME= gitlab-ce PORTVERSION= 12.5.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org Modified: head/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- head/www/gitlab-ce/files/patch-Gemfile Tue Dec 10 20:07:30 2019 (r519776) +++ head/www/gitlab-ce/files/patch-Gemfile Tue Dec 10 20:50:33 2019 (r519777) @@ -1,5 +1,13 @@ ---- Gemfile.orig 2019-11-22 03:17:46 UTC +--- Gemfile.orig 2019-12-03 11:22:02 UTC +++ Gemfile +@@ -1,6 +1,6 @@ + source 'https://rubygems.org' + +-gem 'rails', '5.2.3' ++gem 'rails', '5.2.4' + + gem 'bootsnap', '~> 1.4' + @@ -92,7 +92,6 @@ gem 'graphql', '~> 1.9.11' # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' Modified: head/www/gitlab-ce/files/patch-config_gitlab.yml.example ============================================================================== --- head/www/gitlab-ce/files/patch-config_gitlab.yml.example Tue Dec 10 20:07:30 2019 (r519776) +++ head/www/gitlab-ce/files/patch-config_gitlab.yml.example Tue Dec 10 20:50:33 2019 (r519777) @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2019-10-22 12:01:49 UTC +--- config/gitlab.yml.example.orig 2019-12-03 11:22:02 UTC +++ config/gitlab.yml.example -@@ -894,7 +894,7 @@ production: &base +@@ -902,7 +902,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -9,7 +9,7 @@ # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -912,8 +912,8 @@ production: &base +@@ -920,8 +920,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -20,7 +20,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -959,12 +959,12 @@ production: &base +@@ -967,12 +967,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -36,7 +36,7 @@ # Git over HTTP upload_pack: true -@@ -989,7 +989,7 @@ production: &base +@@ -997,7 +997,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: Modified: head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb ============================================================================== --- head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb Tue Dec 10 20:07:30 2019 (r519776) +++ head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb Tue Dec 10 20:50:33 2019 (r519777) @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2019-10-22 12:01:49 UTC +--- config/initializers/1_settings.rb.orig 2019-12-03 11:22:02 UTC +++ config/initializers/1_settings.rb -@@ -178,12 +178,8 @@ Settings.gitlab['email_smime'] = SmimeSignatureSetting +@@ -179,12 +179,8 @@ Settings.gitlab['email_smime'] = SmimeSignatureSetting Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) Settings.gitlab['user'] ||= 'git'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912102050.xBAKoYJI034381>