Commit a6ce9def authored by Matthias Fechner's avatar Matthias Fechner

First testbuild of gitlab 13.0.0.

parent 9aa30395
......@@ -2,7 +2,7 @@
# $FreeBSD: head/devel/gitlab-shell/Makefile 535976 2020-05-20 06:07:18Z mfechner $
PORTNAME= gitlab-shell
PORTVERSION= 12.2.0
PORTVERSION= 13.2.0
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
......@@ -19,7 +19,7 @@ ALL_TARGET= build
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags
GL_COMMIT= 3e73101ada44b2f65ea1eb14d243fe1daf074692
GL_COMMIT= 4851cf7430cf442446ff947015dd3ebd5303e2c8
BUILD_DEPENDS= rubygem-bundler1=1.17.3:sysutils/rubygem-bundler1
......
TIMESTAMP = 1587535259
TIMESTAMP = 1590226563
SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111
SHA256 (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 3ef6b86658bc370e027304e55a8685767f7fd8a94199f4bea08c9388bf84a1b0
......@@ -49,8 +49,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
SHA256 (gitlab-org-gitlab-shell-3e73101ada44b2f65ea1eb14d243fe1daf074692_GL0.tar.gz) = 05b37dc478b228cd950366424e3032dd2de274b10786fed03c7a42e15a5ebdc1
SIZE (gitlab-org-gitlab-shell-3e73101ada44b2f65ea1eb14d243fe1daf074692_GL0.tar.gz) = 64815
SHA256 (gitlab-org-gitlab-shell-4851cf7430cf442446ff947015dd3ebd5303e2c8_GL0.tar.gz) = 06c1fedbae7f8b31c64a9657746730de029ac9ecacff6344b44467beeda83f87
SIZE (gitlab-org-gitlab-shell-4851cf7430cf442446ff947015dd3ebd5303e2c8_GL0.tar.gz) = 65950
SHA256 (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 717aaa0210924db6f537dbe06e6b373e687fb73ec11f1e0a9f6b12cf4dbc1ce1
SIZE (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 2773612
SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e
......
......@@ -2,7 +2,7 @@
# $FreeBSD: head/textproc/gitlab-elasticsearch-indexer/Makefile 535886 2020-05-19 19:04:53Z mfechner $
PORTNAME= gitlab-elasticsearch-indexer
PORTVERSION= 2.2.0
PORTVERSION= 2.3.0
PORTREVISION= 0
CATEGORIES= textproc
......@@ -23,7 +23,7 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}"
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer/-/tags
GL_COMMIT= 575f22fd6b47ef74172f9cf7e825741145746c3e
GL_COMMIT= a9333a2083099b620ec4a6f65b6395626a8d4b25
# for go dependencies
USE_GITHUB= nodefault
......@@ -33,7 +33,7 @@ GH_TUPLE= \
aws:aws-sdk-go:v1.19.6:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
deoxxa:aws_signing_client:c20ee106809e:deoxxa_aws_signing_client/vendor/github.com/deoxxa/aws_signing_client \
go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
go-yaml:yaml:v2.2.4:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \
golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
golang:sys:86b910548bc1:golang_sys/vendor/golang.org/x/sys \
......@@ -46,13 +46,13 @@ GH_TUPLE= \
konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
mailru:easyjson:1ea4449da983:mailru_easyjson/vendor/github.com/mailru/easyjson \
olivere:elastic:v6.2.24:olivere_elastic/vendor/github.com/olivere/elastic \
pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \
pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
sirupsen:logrus:v1.4.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify
GL_TUPLE= gitlab-org:gitaly:aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \
gitlab-org:labkit:fac94cb428e67efc019e7ba67429b53fa9b394c5:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit \
gitlab-org:labkit:0149780c759d60f61fcfe1648fb882ba7ec41f3f:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit \
lupine:icu:54c89d9b1ef6931b4ff61fa9f4ca645d3b86d6dc:lupine_icu/vendor/gitlab.com/lupine/icu
PLIST_FILES= bin/gitlab-elasticsearch-indexer
......
TIMESTAMP = 1587537978
TIMESTAMP = 1590226247
SHA256 (aws-aws-sdk-go-v1.19.6_GH0.tar.gz) = 5e8e829be8b24850ea044672fedda36bd525b541ffc44ddbad85060190211f5e
SIZE (aws-aws-sdk-go-v1.19.6_GH0.tar.gz) = 10820760
SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
SHA256 (deoxxa-aws_signing_client-c20ee106809e_GH0.tar.gz) = 209275015c4670eff326456edf6ac3b995a29968decae686ccdaf25013d6df72
SIZE (deoxxa-aws_signing_client-c20ee106809e_GH0.tar.gz) = 4323
SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
SHA256 (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 9004c9709200d52ef6e5c69af3f71f3adb1a2b7e884ea7597f306bf54b1f007c
SIZE (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 72209
SHA256 (golang-net-6afb5195e5aa_GH0.tar.gz) = e326d6b33545abf9db8bb622852d66e34f0957833e4c8839f8a01309b5aa263d
SIZE (golang-net-6afb5195e5aa_GH0.tar.gz) = 1172285
SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
......@@ -31,19 +31,19 @@ SHA256 (mailru-easyjson-1ea4449da983_GH0.tar.gz) = 8dee8a32ea94e56c90118b1ff0228
SIZE (mailru-easyjson-1ea4449da983_GH0.tar.gz) = 75475
SHA256 (olivere-elastic-v6.2.24_GH0.tar.gz) = 35365df3873ee77e84d0ce75f4397e07b3429143ab69d8214f4d5bc9883e7517
SIZE (olivere-elastic-v6.2.24_GH0.tar.gz) = 389800
SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5
SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344
SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
SHA256 (sirupsen-logrus-v1.4.1_GH0.tar.gz) = aecd75cfc00edfc8d8bdb013d2cee2a5da686fce31c5cf2ae314ce4642c8e139
SIZE (sirupsen-logrus-v1.4.1_GH0.tar.gz) = 40811
SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
SHA256 (gitlab-org-gitlab-elasticsearch-indexer-575f22fd6b47ef74172f9cf7e825741145746c3e_GL0.tar.gz) = 9a56d76af15c0ae3c772b9fed8303e948b03cd09b9c41e224fd811477d654296
SIZE (gitlab-org-gitlab-elasticsearch-indexer-575f22fd6b47ef74172f9cf7e825741145746c3e_GL0.tar.gz) = 57016
SHA256 (gitlab-org-gitlab-elasticsearch-indexer-a9333a2083099b620ec4a6f65b6395626a8d4b25_GL0.tar.gz) = f9f136616eb628cb57c0b4954d8d41fe727df80df9e63ec0aec08031a308c2ef
SIZE (gitlab-org-gitlab-elasticsearch-indexer-a9333a2083099b620ec4a6f65b6395626a8d4b25_GL0.tar.gz) = 63185
SHA256 (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 717aaa0210924db6f537dbe06e6b373e687fb73ec11f1e0a9f6b12cf4dbc1ce1
SIZE (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 2773612
SHA256 (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 496439133ff65307b8ce231f1c2d1ed27359acfdea5b2826be6799590a65d2f7
SIZE (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 3619731
SHA256 (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = fa3a9e6a6da58375427ee1814d95dba8d55bee13537492bba19480eae772ab95
SIZE (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = 3671144
SHA256 (lupine-icu-54c89d9b1ef6931b4ff61fa9f4ca645d3b86d6dc_GL0.tar.gz) = d68c82b7700c5771dfe061302c7361b405ce6674788da3773ab2d3c2b0c1ccf4
SIZE (lupine-icu-54c89d9b1ef6931b4ff61fa9f4ca645d3b86d6dc_GL0.tar.gz) = 12031
--- Gemfile.orig 2020-05-04 10:07:41 UTC
--- Gemfile.orig 2020-05-21 17:04:27 UTC
+++ Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '6.0.2'
+gem 'rails', '6.0.3.1'
gem 'bootsnap', '~> 1.4.6'
@@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.3.0'
# Supported DBs
gem 'pg', '~> 1.1'
......@@ -33,8 +25,8 @@
+gem 'hipchat', '~> 1.6.0'
# Jira integration
gem 'jira-ruby', '~> 1.7'
@@ -329,91 +328,6 @@ group :metrics do
gem 'jira-ruby', '~> 2.0.0'
@@ -325,94 +324,6 @@ group :metrics do
# Prometheus
gem 'prometheus-client-mmap', '~> 0.10.0'
gem 'raindrops', '~> 0.18'
......@@ -64,7 +56,7 @@
-
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 5.1.0'
- gem 'rspec-rails', '~> 4.0.0.beta4'
- gem 'rspec-rails', '~> 4.0.0'
-
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.11.0'
......@@ -123,6 +115,9 @@
- gem 'test-prof', '~> 0.10.0'
- gem 'rspec_junit_formatter'
- gem 'guard-rspec'
-
- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
- gem 'derailed_benchmarks', require: false
end
gem 'octokit', '~> 4.15'
--- config/gitlab.yml.example.orig 2020-05-15 17:18:13 UTC
--- config/gitlab.yml.example.orig 2020-05-21 17:04:27 UTC
+++ config/gitlab.yml.example
@@ -955,7 +955,7 @@ production: &base
@@ -961,7 +961,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.
@@ -973,8 +973,8 @@ production: &base
@@ -979,8 +979,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
@@ -1020,12 +1020,12 @@ production: &base
@@ -1026,12 +1026,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
......@@ -36,7 +36,7 @@
# Git over HTTP
upload_pack: true
@@ -1044,13 +1044,13 @@ production: &base
@@ -1050,13 +1050,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
......
--- config/initializers/active_record_fix_insert_all.rb.orig 2020-05-15 17:18:13 UTC
+++ config/initializers/active_record_fix_insert_all.rb
@@ -7,7 +7,7 @@
# This is covered by tests in `BulkInsertSafe`
# that validates handling of different data types
-if Rails.gem_version > Gem::Version.new("6.0.2")
+if Rails.gem_version > Gem::Version.new("6.0.3.1")
raise Gem::DependencyError,
"Remove patch once the https://github.com/rails/rails/pull/38763 is included"
end
This diff is collapsed.
# $FreeBSD: head/www/gitlab-pages/Makefile 529314 2020-03-28 09:01:59Z mfechner $
PORTNAME= gitlab-pages
PORTVERSION= 1.17.0
PORTVERSION= 1.18.0
CATEGORIES= www
MAINTAINER= swills@FreeBSD.org
......@@ -17,7 +17,7 @@ USE_GITHUB= nodefault
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags
GL_COMMIT= 52b28999916a20b27c5caa6c399d871c22d146ca
GL_COMMIT= c94ba374aefd919f27a421b542f8bf6e7fbbd468
# Build with: make gomod-vendor
# 43dd
......
TIMESTAMP = 1585311345
TIMESTAMP = 1590226412
SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
SHA256 (certifi-gocertifi-a5e0173ced67_GH0.tar.gz) = f021fd5f62b221aac04e69b030ace59fd2a0912433fb6b938965a61f49410ba6
......@@ -77,8 +77,8 @@ SHA256 (tomasen-realip-f0c99a92ddce_GH0.tar.gz) = 030d3c3dd312e32344080344c8a8dd
SIZE (tomasen-realip-f0c99a92ddce_GH0.tar.gz) = 3126
SHA256 (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 0f865bd53c02e7d89115aaa60ce8b8147b1f71238f2cf33a6593465f845703cb
SIZE (wadey-gocovmerge-b5bfa59ec0ad_GH0.tar.gz) = 2309
SHA256 (gitlab-org-gitlab-pages-52b28999916a20b27c5caa6c399d871c22d146ca_GL0.tar.gz) = 77adf3c7b8cdf244f0f55e155d3ddcc161a96c209ecca7336c89718cc5f6879f
SIZE (gitlab-org-gitlab-pages-52b28999916a20b27c5caa6c399d871c22d146ca_GL0.tar.gz) = 126786
SHA256 (gitlab-org-gitlab-pages-c94ba374aefd919f27a421b542f8bf6e7fbbd468_GL0.tar.gz) = 5ebc5fdf9036ff78a9c4c2b908602fce0faa7457a5328d76d42473f4b68d6111
SIZE (gitlab-org-gitlab-pages-c94ba374aefd919f27a421b542f8bf6e7fbbd468_GL0.tar.gz) = 128550
SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c
SIZE (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = 2660149
SHA256 (lupine-go-mimedb-e8af1d65987739a7ab277dedd9772c7398154ff3_GL0.tar.gz) = 1312f727d2910acf56382c6dfc26eb4d504fb02d79d7fc731f514d051e275d91
......
......@@ -2,7 +2,7 @@
# $FreeBSD: head/www/gitlab-workhorse/Makefile 535981 2020-05-20 06:11:39Z mfechner $
PORTNAME= gitlab-workhorse
PORTVERSION= 8.30.1
PORTVERSION= 8.31.0
PORTREVISION= 0
CATEGORIES= www
......@@ -21,7 +21,7 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}"
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags
GL_COMMIT= d0573443810ed08c8425cf771cb0758621ce0baf
GL_COMMIT= c4f1edeb92ee730356ff774d2adf5b7ea0eab518
# for go dependencies
USE_GITHUB= nodefault
......
TIMESTAMP = 1587535814
TIMESTAMP = 1590226739
SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
......@@ -111,8 +111,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
SHA256 (gitlab-org-gitlab-workhorse-d0573443810ed08c8425cf771cb0758621ce0baf_GL0.tar.gz) = db17774b2c796725f9dfed0fbeaaf73044f1c51c01d30def5edfab63ef5baa3b
SIZE (gitlab-org-gitlab-workhorse-d0573443810ed08c8425cf771cb0758621ce0baf_GL0.tar.gz) = 216432
SHA256 (gitlab-org-gitlab-workhorse-c4f1edeb92ee730356ff774d2adf5b7ea0eab518_GL0.tar.gz) = 56b095d597afd269cf247f34ea486b2d721e6cd85109ff9ff38dbebb1bfe1349
SIZE (gitlab-org-gitlab-workhorse-c4f1edeb92ee730356ff774d2adf5b7ea0eab518_GL0.tar.gz) = 221855
SHA256 (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 40decb68620c061cadba556f836ef8efc953372b32903fd90825bb88fa79e943
SIZE (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 2800331
SHA256 (gitlab-org-labkit-fac94cb428e67efc019e7ba67429b53fa9b394c5_GL0.tar.gz) = 496439133ff65307b8ce231f1c2d1ed27359acfdea5b2826be6799590a65d2f7
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment