mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
www/gitlab-ce: Major upgrade to 13.11.1.
Changelog: https://about.gitlab.com/releases/2021/04/22/gitlab-13-11-released/ https://about.gitlab.com/releases/2021/04/23/gitlab-13-11-1-released/
This commit is contained in:
Matthias Fechner
parent
fe814b7caf
commit
b838d9b5da
8 changed files with 1294 additions and 3276 deletions
|
|
@ -1,7 +1,7 @@
|
|||
# Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
|
||||
|
||||
PORTNAME= gitlab-ce
|
||||
PORTVERSION= 13.10.3
|
||||
PORTVERSION= 13.11.1
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= www devel
|
||||
|
||||
|
|
@ -13,18 +13,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.29:devel/git \
|
||||
MY_DEPENDS= git>=2.31.0:devel/git \
|
||||
gitaly>=${PORTVERSION}:devel/gitaly \
|
||||
gitlab-elasticsearch-indexer>=2.9.0:textproc/gitlab-elasticsearch-indexer \
|
||||
gitlab-agent>=13.9.1:net/gitlab-agent \
|
||||
gitlab-pages>=1.36.0:www/gitlab-pages \
|
||||
gitlab-agent>=${PORTVERSION}:net/gitlab-agent \
|
||||
gitlab-pages>=1.38.0:www/gitlab-pages \
|
||||
gitlab-shell>=13.17.0:devel/gitlab-shell \
|
||||
gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
|
||||
redis>=4.0.0:databases/redis \
|
||||
yarn>=1.10.0:www/yarn \
|
||||
gtar>0:archivers/gtar \
|
||||
bash>0:shells/bash \
|
||||
rubygem-rails60>=6.0.3.3<6.1:www/rubygem-rails60 \
|
||||
rubygem-rails60>=6.0.3.6<6.1:www/rubygem-rails60 \
|
||||
rubygem-bootsnap14>=1.4.6<2.0:devel/rubygem-bootsnap14 \
|
||||
rubygem-responders-rails60>=3.0<4.0:www/rubygem-responders-rails60 \
|
||||
rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
|
||||
|
|
@ -66,7 +66,7 @@ MY_DEPENDS= git>=2.29:devel/git \
|
|||
rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \
|
||||
rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
|
||||
rubygem-invisible_captcha>=1.1.0<1.2.0:graphics/rubygem-invisible_captcha \
|
||||
rubygem-devise-two-factor-rails60>=3.1.0<3.2.0:security/rubygem-devise-two-factor-rails60 \
|
||||
rubygem-devise-two-factor-rails60>=4.0.0<4.1:security/rubygem-devise-two-factor-rails60 \
|
||||
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 \
|
||||
|
|
@ -89,7 +89,7 @@ MY_DEPENDS= git>=2.29:devel/git \
|
|||
rubygem-hashie>0:devel/rubygem-hashie \
|
||||
rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \
|
||||
rubygem-kaminari-rails60>=1.2.1<2.0:www/rubygem-kaminari-rails60 \
|
||||
rubygem-hamlit>=2.14.4<2.15:www/rubygem-hamlit \
|
||||
rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \
|
||||
rubygem-carrierwave>=1.3<2.0:www/rubygem-carrierwave \
|
||||
rubygem-mini_magick>=4.10.1<4.11:graphics/rubygem-mini_magick \
|
||||
rubygem-fog-aws>=3.9<4.0:net/rubygem-fog-aws \
|
||||
|
|
@ -115,7 +115,7 @@ MY_DEPENDS= git>=2.29:devel/git \
|
|||
rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \
|
||||
rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \
|
||||
rubygem-commonmarker>=0.21<1.0:textproc/rubygem-commonmarker \
|
||||
rubygem-kramdown>=2.3.0<2.4:textproc/rubygem-kramdown \
|
||||
rubygem-kramdown>=2.3.1<2.4:textproc/rubygem-kramdown \
|
||||
rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
|
||||
rubygem-rdoc>=6.1.2<7:devel/rubygem-rdoc \
|
||||
rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \
|
||||
|
|
@ -128,7 +128,7 @@ MY_DEPENDS= git>=2.29:devel/git \
|
|||
rubygem-rouge>=3.26.0<3.27:textproc/rubygem-rouge \
|
||||
rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
|
||||
rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \
|
||||
rubygem-nokogiri>=1.11.1<1.12:textproc/rubygem-nokogiri \
|
||||
rubygem-nokogiri>=1.11.3<1.12:textproc/rubygem-nokogiri \
|
||||
rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \
|
||||
rubygem-icalendar>=0:devel/rubygem-icalendar \
|
||||
rubygem-diffy>=3.3<4:textproc/rubygem-diffy \
|
||||
|
|
@ -144,7 +144,7 @@ MY_DEPENDS= git>=2.29:devel/git \
|
|||
rubygem-sidekiq5>=5.2.9<5.3.0:devel/rubygem-sidekiq5 \
|
||||
rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \
|
||||
rubygem-redis-namespace17>=1.7.0<1.8.0:databases/rubygem-redis-namespace17 \
|
||||
rubygem-gitlab-sidekiq-fetcher>=0.5.5<0.5.6:devel/rubygem-gitlab-sidekiq-fetcher \
|
||||
rubygem-gitlab-sidekiq-fetcher>=0.5.6<0.5.7:devel/rubygem-gitlab-sidekiq-fetcher \
|
||||
rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \
|
||||
rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \
|
||||
rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \
|
||||
|
|
@ -168,11 +168,10 @@ MY_DEPENDS= git>=2.29:devel/git \
|
|||
rubygem-kubeclient>=4.9.1<4.10.0:www/rubygem-kubeclient \
|
||||
rubygem-sanitize>=5.2.1<6:textproc/rubygem-sanitize \
|
||||
rubygem-babosa>=1.0.2<1.1.0:textproc/rubygem-babosa \
|
||||
rubygem-loofah>=2.8<3.0:textproc/rubygem-loofah \
|
||||
rubygem-loofah>=2.9.0<3.0:textproc/rubygem-loofah \
|
||||
rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
|
||||
rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \
|
||||
rubygem-ruby-magic-static>=0.3.4<0.4:devel/rubygem-ruby-magic-static \
|
||||
rubygem-mimemagic>=0.3.7<0.4.0:misc/rubygem-mimemagic \
|
||||
rubygem-ruby-magic>=0.4<1:devel/rubygem-ruby-magic \
|
||||
rubygem-fast_blank>=0:devel/rubygem-fast_blank \
|
||||
rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \
|
||||
rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \
|
||||
|
|
@ -182,15 +181,15 @@ MY_DEPENDS= git>=2.29:devel/git \
|
|||
rubygem-terser>=1.0.2:textproc/rubygem-terser \
|
||||
rubygem-addressable>=2.7<3:www/rubygem-addressable \
|
||||
rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \
|
||||
rubygem-gon-rails60>=6.2<7.0:www/rubygem-gon-rails60 \
|
||||
rubygem-gon-rails60>=6.4.0<6.5:www/rubygem-gon-rails60 \
|
||||
rubygem-request_store>=1.5<2.0:devel/rubygem-request_store \
|
||||
rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
|
||||
rubygem-gitlab-license>=1.3.1<2.0:devel/rubygem-gitlab-license \
|
||||
rubygem-gitlab-license>=1.4<2.0:devel/rubygem-gitlab-license \
|
||||
rubygem-rack-attack>=6.3.0<6.4.0:www/rubygem-rack-attack \
|
||||
rubygem-sentry-raven>=3.0<4.0:devel/rubygem-sentry-raven \
|
||||
rubygem-pg_query>=1.3.0<1.4:databases/rubygem-pg_query \
|
||||
rubygem-premailer-rails-rails60>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails60 \
|
||||
rubygem-gitlab-labkit>=0.16.1<0.17:devel/rubygem-gitlab-labkit \
|
||||
rubygem-gitlab-labkit>=0.16.2<0.17:devel/rubygem-gitlab-labkit \
|
||||
rubygem-thrift>=0.14.0:devel/rubygem-thrift \
|
||||
rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \
|
||||
rubygem-rails-i18n-rails60>=6.0<7.0:devel/rubygem-rails-i18n-rails60 \
|
||||
|
|
@ -223,15 +222,15 @@ MY_DEPENDS= git>=2.29: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.9.0.pre.rc1<13.10.0:net/rubygem-gitaly \
|
||||
rubygem-gitaly>=13.11.0.pre.rc1<13.12.0:net/rubygem-gitaly \
|
||||
rubygem-grpc130>=1.30.2<1.31:net/rubygem-grpc130 \
|
||||
rubygem-google-protobuf314>=3.12<3.15:devel/rubygem-google-protobuf314 \
|
||||
rubygem-google-protobuf314>=3.14.0<3.15:devel/rubygem-google-protobuf314 \
|
||||
rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
|
||||
rubygem-flipper017>=0.17.1<0.18.0:devel/rubygem-flipper017 \
|
||||
rubygem-flipper-active_record017>=0.17.1<0.18.0:databases/rubygem-flipper-active_record017 \
|
||||
rubygem-flipper-active_support_cache_store017>=0.17.1<0.18.0:devel/rubygem-flipper-active_support_cache_store017 \
|
||||
rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \
|
||||
rubygem-gitlab-experiment>=0.5.0<0.6:devel/rubygem-gitlab-experiment \
|
||||
rubygem-gitlab-experiment>=0.5.3<0.6:devel/rubygem-gitlab-experiment \
|
||||
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 \
|
||||
|
|
@ -240,10 +239,9 @@ MY_DEPENDS= git>=2.29:devel/git \
|
|||
rubygem-lru_redux>0:devel/rubygem-lru_redux \
|
||||
rubygem-erubi19>=1.9.0<1.10:www/rubygem-erubi19 \
|
||||
rubygem-mail>=2.7.1<2.7.2,2:mail/rubygem-mail \
|
||||
rubygem-lockbox>=0.3.3<0.4.0:security/rubygem-lockbox \
|
||||
rubygem-lockbox>=0.6.2<0.7: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-schema>=2.8.0<2.9:devel/rubygem-json-schema \
|
||||
rubygem-json_schemer>=0.2.12<0.3:devel/rubygem-json_schemer \
|
||||
rubygem-oj310>=3.10.6<3.11:devel/rubygem-oj310 \
|
||||
rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \
|
||||
|
|
@ -271,7 +269,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?= b1774ad36a965ba5077db6db11e13f2837284158
|
||||
GL_COMMIT?= 2fad41087674984a064cf6a312ac34c16bb2a1aa
|
||||
|
||||
USERS= git
|
||||
GROUPS= git
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1618464119
|
||||
SHA256 (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 0a27e1203218d9fc50193632dfbf3cf1bab128edbcd3c875085f4a6c74e9192d
|
||||
SIZE (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 100475905
|
||||
TIMESTAMP = 1619163494
|
||||
SHA256 (gitlab-org-gitlab-foss-2fad41087674984a064cf6a312ac34c16bb2a1aa_GL0.tar.gz) = 8d177e531830aeac7a94ac53c92222f796b7a5c7d1a3dd6b8a0baafc5e466e60
|
||||
SIZE (gitlab-org-gitlab-foss-2fad41087674984a064cf6a312ac34c16bb2a1aa_GL0.tar.gz) = 96845275
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- Gemfile.orig 2021-03-31 12:23:42 UTC
|
||||
--- Gemfile.orig 2021-04-22 21:13:23 UTC
|
||||
+++ Gemfile
|
||||
@@ -83,7 +83,7 @@ gem 'gpgme', '~> 2.0.19'
|
||||
@@ -85,7 +85,7 @@ gem 'gpgme', '~> 2.0.19'
|
||||
# GitLab fork with several improvements to original library. For full list of changes
|
||||
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
|
||||
gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
# API
|
||||
gem 'grape', '~> 1.5.2'
|
||||
@@ -97,7 +97,6 @@ gem 'graphql', '~> 1.11.8'
|
||||
@@ -99,7 +99,6 @@ gem 'graphql', '~> 1.11.8'
|
||||
# https://gitlab.com/gitlab-org/gitlab/issues/31747
|
||||
gem 'graphiql-rails', '~> 1.4.10'
|
||||
gem 'apollo_upload_server', '~> 2.0.2'
|
||||
|
|
@ -17,16 +17,16 @@
|
|||
gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
|
||||
|
||||
gem 'hashie'
|
||||
@@ -152,7 +151,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark
|
||||
@@ -154,7 +153,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark
|
||||
gem 'commonmarker', '~> 0.21'
|
||||
gem 'kramdown', '~> 2.3.0'
|
||||
gem 'kramdown', '~> 2.3.1'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
-gem 'rdoc', '~> 6.1.2'
|
||||
+gem 'rdoc', '~> 6.1'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
@@ -335,107 +334,13 @@ gem 'snowplow-tracker', '~> 0.6.1'
|
||||
@@ -334,106 +333,11 @@ gem 'snowplow-tracker', '~> 0.6.1'
|
||||
# Metrics
|
||||
group :metrics do
|
||||
gem 'method_source', '~> 1.0', require: false
|
||||
|
|
@ -36,16 +36,15 @@
|
|||
# Prometheus
|
||||
gem 'prometheus-client-mmap', '~> 0.12.0'
|
||||
gem 'raindrops', '~> 0.18'
|
||||
end
|
||||
|
||||
-group :development do
|
||||
- gem 'brakeman', '~> 4.2', require: false
|
||||
- gem 'lefthook', '~> 0.7', require: false
|
||||
-end
|
||||
-
|
||||
- gem 'letter_opener_web', '~> 1.3.4'
|
||||
-group :development do
|
||||
- gem 'lefthook', '~> 0.7.0', require: false
|
||||
-
|
||||
- gem 'letter_opener_web', '~> 1.4.0'
|
||||
-
|
||||
- # Better errors handler
|
||||
- gem 'better_errors', '~> 2.7.1'
|
||||
- gem 'better_errors', '~> 2.9.0'
|
||||
-
|
||||
- # thin instead webrick
|
||||
- gem 'thin', '~> 1.8.0'
|
||||
|
|
@ -62,7 +61,7 @@
|
|||
-
|
||||
- gem 'database_cleaner', '~> 1.7.0'
|
||||
- gem 'factory_bot_rails', '~> 6.1.0'
|
||||
- gem 'rspec-rails', '~> 4.0.2'
|
||||
- gem 'rspec-rails', '~> 5.0.1'
|
||||
-
|
||||
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
||||
- gem 'minitest', '~> 5.11.0'
|
||||
|
|
@ -73,14 +72,14 @@
|
|||
- gem 'spring', '~> 2.1.0'
|
||||
- gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
-
|
||||
- gem 'gitlab-styles', '~> 6.1.0', require: false
|
||||
- gem 'gitlab-styles', '~> 6.2.0', require: false
|
||||
-
|
||||
- gem 'haml_lint', '~> 0.36.0', require: false
|
||||
- gem 'bundler-audit', '~> 0.7.0.1', require: false
|
||||
-
|
||||
- gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||
-
|
||||
- gem 'knapsack', '~> 1.17'
|
||||
- gem 'knapsack', '~> 1.21.1'
|
||||
- gem 'crystalball', '~> 0.7.0', require: false
|
||||
-
|
||||
- gem 'simple_po_parser', '~> 1.1.2', require: false
|
||||
|
|
@ -92,11 +91,12 @@
|
|||
- gem 'parallel', '~> 1.19', require: false
|
||||
-
|
||||
- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
|
||||
-
|
||||
- gem 'test_file_finder', '~> 0.1.3'
|
||||
-end
|
||||
-
|
||||
-group :development, :test, :danger do
|
||||
- gem 'danger-gitlab', '~> 8.0', require: false
|
||||
- gem 'gitlab-dangerfiles', '~> 0.8.0', require: false
|
||||
- gem 'gitlab-dangerfiles', '~> 1.1.1', require: false
|
||||
-end
|
||||
-
|
||||
-group :development, :test, :coverage do
|
||||
|
|
@ -110,6 +110,7 @@
|
|||
-end
|
||||
-
|
||||
-group :test do
|
||||
- gem 'json-schema', '~> 2.8.0'
|
||||
- gem 'fuubar', '~> 2.2.0'
|
||||
- gem 'rspec-retry', '~> 0.6.1'
|
||||
- gem 'rspec_profiling', '~> 0.0.6'
|
||||
|
|
@ -130,17 +131,6 @@
|
|||
-
|
||||
- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
|
||||
- gem 'derailed_benchmarks', require: false
|
||||
-end
|
||||
-
|
||||
end
|
||||
|
||||
gem 'octokit', '~> 4.15'
|
||||
|
||||
# https://gitlab.com/gitlab-org/gitlab/issues/207207
|
||||
@@ -479,7 +384,7 @@ gem 'gitaly', '~> 13.9.0.pre.rc1'
|
||||
|
||||
gem 'grpc', '~> 1.30.2'
|
||||
|
||||
-gem 'google-protobuf', '~> 3.12'
|
||||
+gem 'google-protobuf', '~> 3.14.0'
|
||||
|
||||
gem 'toml-rb', '~> 1.0.0'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- config/gitlab.yml.example.orig 2021-03-18 01:45:05 UTC
|
||||
--- config/gitlab.yml.example.orig 2021-04-22 21:13:23 UTC
|
||||
+++ config/gitlab.yml.example
|
||||
@@ -1073,7 +1073,7 @@ production: &base
|
||||
@@ -1084,7 +1084,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.
|
||||
@@ -1091,8 +1091,8 @@ production: &base
|
||||
@@ -1102,8 +1102,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
|
||||
@@ -1138,12 +1138,12 @@ production: &base
|
||||
@@ -1149,12 +1149,12 @@ production: &base
|
||||
|
||||
## GitLab Shell settings
|
||||
gitlab_shell:
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
# Git over HTTP
|
||||
upload_pack: true
|
||||
@@ -1158,13 +1158,13 @@ production: &base
|
||||
@@ -1169,13 +1169,13 @@ production: &base
|
||||
workhorse:
|
||||
# File that contains the secret key for verifying access for gitlab-workhorse.
|
||||
# Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
|
||||
# The URL to the external KAS API (used by the Kubernetes agents)
|
||||
# external_url: wss://kas.example.com
|
||||
@@ -1174,13 +1174,13 @@ production: &base
|
||||
@@ -1185,13 +1185,13 @@ production: &base
|
||||
|
||||
## GitLab Elasticsearch settings
|
||||
elasticsearch:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- config/initializers/1_settings.rb.orig 2021-02-19 09:35:35 UTC
|
||||
--- config/initializers/1_settings.rb.orig 2021-04-22 21:13:23 UTC
|
||||
+++ config/initializers/1_settings.rb
|
||||
@@ -182,11 +182,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
|
||||
Settings.gitlab['user'] ||= 'git'
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- config/unicorn.rb.example.orig 2020-02-21 15:14:12 UTC
|
||||
--- config/unicorn.rb.example.orig 2021-04-22 21:13:23 UTC
|
||||
+++ config/unicorn.rb.example
|
||||
@@ -33,12 +33,12 @@ worker_processes 3
|
||||
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
+listen "%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab.socket", :backlog => 1024
|
||||
listen "127.0.0.1:8080", :tcp_nopush => true
|
||||
|
||||
# nuke workers after 30 seconds instead of 60 seconds (the default)
|
||||
# destroy workers after 30 seconds instead of 60 seconds (the default)
|
||||
@@ -59,13 +59,13 @@ listen "127.0.0.1:8080", :tcp_nopush => true
|
||||
timeout 60
|
||||
|
||||
|
|
|
|||
|
|
@ -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/13.10-freebsd.md
|
||||
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/13.11-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/13.9-13.10-freebsd.md
|
||||
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/13.10-13.11-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
Loading…
Add table
Reference in a new issue