1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00

Update to 13.1.

Changelog:
https://about.gitlab.com/releases/2020/06/22/gitlab-13-1-released/
This commit is contained in:
Matthias Fechner 2020-06-22 18:36:25 +00:00
parent 7b1179680e
commit ac9f7fd6b8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=539901
6 changed files with 1091 additions and 615 deletions

View File

@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= gitlab-ce
PORTVERSION= 13.0.6
PORTREVISION= 1
PORTVERSION= 13.1.0
PORTREVISION= 0
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@ -14,18 +14,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# the rubygems of RUN_DEPENDS matches the order of the Gemfile
# which makes maintaining this long list much easier!
MY_DEPENDS= git>=2.24.3:devel/git \
MY_DEPENDS= git>=2.25:devel/git \
gitaly>=${PORTVERSION}:devel/gitaly \
gitlab-elasticsearch-indexer>=2.3.0:textproc/gitlab-elasticsearch-indexer \
gitlab-pages>=1.18.0:www/gitlab-pages \
gitlab-shell>=13.3.0:devel/gitlab-shell \
gitlab-workhorse>=8.31.1:www/gitlab-workhorse \
gitlab-workhorse>=8.35.0:www/gitlab-workhorse \
redis>=3.2.12:databases/redis \
yarn>=1.10.0:www/yarn \
gtar>0:archivers/gtar \
bash>0:shells/bash \
gtar>0:archivers/gtar \
rubygem-rails60>=6.0.3<6.1:www/rubygem-rails60 \
rubygem-rails60>=6.0.3.1<6.1:www/rubygem-rails60 \
rubygem-bootsnap>=1.4.6<2.0:devel/rubygem-bootsnap \
rubygem-nakayoshi_fork>=0.0.4<0.1.0:devel/rubygem-nakayoshi_fork \
rubygem-responders-rails60>=3.0<4.0:www/rubygem-responders-rails60 \
@ -34,7 +34,7 @@ MY_DEPENDS= git>=2.24.3:devel/git \
rubygem-pg>=1.1<2:databases/rubygem-pg \
rubygem-rugged>=0.28:devel/rubygem-rugged \
rubygem-grape-path-helpers>=1.2<2.0:devel/rubygem-grape-path-helpers \
rubygem-faraday0>=0.12<1.0:www/rubygem-faraday0 \
rubygem-faraday0>=0.17.3<1.0:www/rubygem-faraday0 \
rubygem-marginalia>=1.8.0<1.9:databases/rubygem-marginalia \
rubygem-devise-rails60>=4.6<5.0:devel/rubygem-devise-rails60 \
rubygem-doorkeeper>=5.0.3<5.1:security/rubygem-doorkeeper \
@ -54,7 +54,7 @@ MY_DEPENDS= git>=2.24.3:devel/git \
rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \
rubygem-omniauth_crowd22>=2.2.0<2.3.0:devel/rubygem-omniauth_crowd22 \
rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \
rubygem-omniauth_openid_connect>=0.3.3<0.4.0:net/rubygem-omniauth_openid_connect \
rubygem-omniauth_openid_connect>=0.3.5<0.4.0:net/rubygem-omniauth_openid_connect \
rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \
rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \
rubygem-rack-oauth2>=1.9.3<1.10.0:security/rubygem-rack-oauth2 \
@ -67,7 +67,7 @@ MY_DEPENDS= git>=2.24.3:devel/git \
rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \
rubygem-attr_encrypted>=3.1.0<3.2.0:security/rubygem-attr_encrypted \
rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \
rubygem-validates_hostname>=1.0.6<1.1.0:dns/rubygem-validates_hostname \
rubygem-validates_hostname>=1.0.10<1.1.0:dns/rubygem-validates_hostname \
rubygem-rubyzip20>=2.0.0<2.1.0:archivers/rubygem-rubyzip20 \
rubygem-acme-client>=2.0.5<2.1.0:security/rubygem-acme-client \
rubygem-browser>=2.5<3.0:www/rubygem-browser \
@ -88,12 +88,12 @@ MY_DEPENDS= git>=2.24.3:devel/git \
rubygem-mini_magick>0:graphics/rubygem-mini_magick \
rubygem-fog-aws>=3.5<4.0:net/rubygem-fog-aws \
rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \
rubygem-fog-google19>=1.9<1.10:net/rubygem-fog-google19 \
rubygem-fog-google>=1.10<2:net/rubygem-fog-google \
rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \
rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \
rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \
rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \
rubygem-google-api-client>=0.23<1.0:devel/rubygem-google-api-client \
rubygem-google-api-client>=0.33<1:devel/rubygem-google-api-client \
rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \
rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \
rubygem-elasticsearch-model6>=6.1<7:textproc/rubygem-elasticsearch-model6 \
@ -202,7 +202,7 @@ MY_DEPENDS= git>=2.24.3:devel/git \
rubygem-memory_profiler>=0.9<1.0:devel/rubygem-memory_profiler \
rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \
rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
rubygem-oauth2>=1.4<2.0:net/rubygem-oauth2 \
rubygem-oauth2>=1.4.4<2.0:net/rubygem-oauth2 \
rubygem-health_check26-rails60>=2.6.0<2.7.0:devel/rubygem-health_check26-rails60 \
rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \
rubygem-sys-filesystem>=1.1.6<1.2.0:sysutils/rubygem-sys-filesystem \
@ -211,7 +211,7 @@ MY_DEPENDS= git>=2.24.3:devel/git \
rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \
rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly>=13.0.0.p.r1<13.1.0:net/rubygem-gitaly \
rubygem-gitaly>=13.1.0.p.r1<13.1.0:net/rubygem-gitaly \
rubygem-grpc124>=1.24.0:net/rubygem-grpc124 \
rubygem-google-protobuf38>=3.8.:devel/rubygem-google-protobuf38 \
rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
@ -219,7 +219,7 @@ MY_DEPENDS= git>=2.24.3:devel/git \
rubygem-flipper-active_record>=0.17.1<0.18.0:databases/rubygem-flipper-active_record \
rubygem-flipper-active_support_cache_store>=0.17.1<0.18.0:devel/rubygem-flipper-active_support_cache_store \
rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \
rubygem-lograge-rails60>=0.5<1.0:www/rubygem-lograge-rails60 \
rubygem-lograge-rails60>=0.11.2<1.0:www/rubygem-lograge-rails60 \
rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \
rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \
rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries \
@ -229,7 +229,8 @@ MY_DEPENDS= git>=2.24.3:devel/git \
rubygem-mail>=2.7.1<2.7.2,2:mail/rubygem-mail \
rubygem-lockbox>=0.3.3<0.4.0:security/rubygem-lockbox \
rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
rubygem-json>=2.3.0<2.4:devel/rubygem-json
rubygem-json>=2.3.0<2.4:devel/rubygem-json \
rubygem-json-schema>=2.8.0<2.9:devel/rubygem-json-schema
BUILD_DEPENDS= gem:devel/ruby-gems \
${MY_DEPENDS}
@ -250,7 +251,7 @@ USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
GL_PROJECT= gitlab-foss
# Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
GL_COMMIT= 5aa982e01ea9793c71f9f1a6ac0146f4ffe52879
GL_COMMIT= d62ee60b669e7b637038e97b647cfa7d50951375
SHEBANG_FILES= bin/background_* scripts/build_assets_image scripts/clean-old-cached-assets scripts/create_postgres_user.sh scripts/prepare_postgres_fdw.sh scripts/review_apps/gcp_cleanup.sh scripts/rspec_helpers.sh scripts/security-harness
USERS= git

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1591859680
SHA256 (gitlab-org-gitlab-foss-5aa982e01ea9793c71f9f1a6ac0146f4ffe52879_GL0.tar.gz) = a2384efb029636e9f2d9146e447d257a3058a18069b4e71e555e76abd0b4e2b9
SIZE (gitlab-org-gitlab-foss-5aa982e01ea9793c71f9f1a6ac0146f4ffe52879_GL0.tar.gz) = 91944481
TIMESTAMP = 1592634907
SHA256 (gitlab-org-gitlab-foss-d62ee60b669e7b637038e97b647cfa7d50951375_GL0.tar.gz) = d8f875d16d5258c88498df71cfd53a7e7f94204cf420bf4ed918b3bcf2b72031
SIZE (gitlab-org-gitlab-foss-d62ee60b669e7b637038e97b647cfa7d50951375_GL0.tar.gz) = 93876239

View File

@ -1,4 +1,4 @@
--- Gemfile.orig 2020-05-21 17:04:27 UTC
--- Gemfile.orig 2020-06-19 16:45:52 UTC
+++ Gemfile
@@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.3.0'
# Supported DBs
@ -9,7 +9,7 @@
gem 'grape-path-helpers', '~> 1.2'
gem 'faraday', '~> 0.12'
@@ -93,7 +93,6 @@ gem 'graphql', '~> 1.10.5'
@@ -92,7 +92,6 @@ gem 'graphql', '~> 1.10.5'
# https://gitlab.com/gitlab-org/gitlab/issues/31747
gem 'graphiql-rails', '~> 1.4.10'
gem 'apollo_upload_server', '~> 2.0.0.beta3'
@ -17,7 +17,7 @@
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -227,7 +226,7 @@ gem 'redis-rails', '~> 5.0.2'
@@ -226,7 +225,7 @@ gem 'redis-rails', '~> 5.0.2'
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
@ -26,7 +26,7 @@
# Jira integration
gem 'jira-ruby', '~> 2.0.0'
@@ -325,94 +324,6 @@ group :metrics do
@@ -324,93 +323,6 @@ group :metrics do
# Prometheus
gem 'prometheus-client-mmap', '~> 0.10.0'
gem 'raindrops', '~> 0.18'
@ -48,7 +48,7 @@
-end
-
-group :development, :test do
- gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
- gem 'bullet', '~> 6.0.2'
- gem 'pry-byebug', '~> 3.5.1', platform: :mri
- gem 'pry-rails', '~> 0.3.9'
-
@ -67,10 +67,10 @@
- gem 'spring', '~> 2.0.0'
- gem 'spring-commands-rspec', '~> 1.0.4'
-
- gem 'gitlab-styles', '~> 3.2.0', require: false
- gem 'gitlab-styles', '~> 4.2.0', require: false
- # Pin these dependencies, otherwise a new rule could break the CI pipelines
- gem 'rubocop', '~> 0.74.0'
- gem 'rubocop-performance', '~> 1.4.1'
- gem 'rubocop', '~> 0.82.0'
- gem 'rubocop-performance', '~> 1.5.2'
- gem 'rubocop-rspec', '~> 1.37.0'
-
- gem 'scss_lint', '~> 0.56.0', require: false
@ -108,7 +108,6 @@
-
- gem 'shoulda-matchers', '~> 4.0.1', require: false
- gem 'email_spec', '~> 2.2.0'
- gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 3.5.1'
- gem 'rails-controller-testing'
- gem 'concurrent-ruby', '~> 1.1'

View File

@ -1,6 +1,6 @@
--- config/gitlab.yml.example.orig 2020-05-21 17:04:27 UTC
--- config/gitlab.yml.example.orig 2020-06-19 16:45:52 UTC
+++ config/gitlab.yml.example
@@ -961,7 +961,7 @@ production: &base
@@ -971,7 +971,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.
@@ -979,8 +979,8 @@ production: &base
@@ -989,8 +989,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
@@ -1026,12 +1026,12 @@ production: &base
@@ -1036,12 +1036,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -36,7 +36,7 @@
# Git over HTTP
upload_pack: true
@@ -1050,13 +1050,13 @@ production: &base
@@ -1060,13 +1060,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:

View File

@ -6,7 +6,7 @@ Gitlab was installed successfully.
You now need to set up the various components of Gitlab, so please
follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/12.10-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/13.1-freebsd.md
EOM
type: install
}
@ -20,7 +20,7 @@ EOM
If you just installed an major upgrade of GitLab, for example you
switched from 12.6.x to 12.7.x, please follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.10-13.0-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/13.0-13.1-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:

File diff suppressed because it is too large Load Diff