[arch-commits] Commit in gitlab/trunk (PKGBUILD configs.patch fixes.patch)
Anatol Pomozov
anatolik at gemini.archlinux.org
Tue Aug 24 17:27:09 UTC 2021
Date: Tuesday, August 24, 2021 @ 17:27:08
Author: anatolik
Revision: 1004647
upgpkg: gitlab 14.2.1-1
Modified:
gitlab/trunk/PKGBUILD
gitlab/trunk/configs.patch
gitlab/trunk/fixes.patch
---------------+
PKGBUILD | 6 +++---
configs.patch | 48 ++++++++++++++++++++++++------------------------
fixes.patch | 4 ++--
3 files changed, 29 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-08-24 17:04:27 UTC (rev 1004646)
+++ PKGBUILD 2021-08-24 17:27:08 UTC (rev 1004647)
@@ -8,7 +8,7 @@
# Contributor: Caleb Maclennan <caleb at alerque.com>
pkgname=gitlab
-pkgver=14.1.2
+pkgver=14.2.1
pkgrel=1
pkgdesc="Project management and code hosting application"
arch=('x86_64')
@@ -40,8 +40,8 @@
gitlab.logrotate)
install='gitlab.install'
sha512sums=('SKIP'
- 'e90176d2dd074caa38060e65eb8fe520f82badb41e9159aeac2c8720b06bcb1c9d21e47865ead3c028431a570e640dd3421f9210b339bd9a2a33e7fadf3759b8'
- '5bce138c8fe22eec324fb93b53b99221a3ee4ba944f8ac6327aa49b24dfac74459eb271da5d5edae64eea4c6eedd44eaf2c73fa247c0591b99316df7b9e488d7'
+ '77b261a9e3e780b8f10a7d2a4a8707a5339071bb0bc570eea57f9d95f826ca12f495701aa3b44b2bc88b513c938e82d4895f9cc7e6031eaf6d5d0161bf6814a2'
+ '33441a2748d4eb45e8053346f2e570aa164acf943c40249c26a19783b267127dd150c99990163219763066ffefebef644b1721c4beeca57f73e012ee2b2c4396'
'5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
'451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba'
'419848c668928276620b5229e457a39e0ed7e111f1da68a30c3e0ae1a644af1c869b004b35435ccec4ddcdf6cf7418b1ab71e6e2ee8a2c861c6625c8bfd908f6'
Modified: configs.patch
===================================================================
--- configs.patch 2021-08-24 17:04:27 UTC (rev 1004646)
+++ configs.patch 2021-08-24 17:27:08 UTC (rev 1004647)
@@ -1,4 +1,4 @@
-commit 6df43c9b41e0f03a22c9592f228c4d9ec9f8cd07
+commit d9420c988705a7eec9e72e11e069d8955fdc1fb6
Author: Anatol Pomozov <anatol.pomozov at gmail.com>
Date: Tue May 26 00:01:38 2020 -0700
@@ -37,10 +37,10 @@
host: localhost
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index f63c42be6ee..a7970d48da8 100644
+index f7b1c2f7567..afb92b5d5b8 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
-@@ -85,7 +85,7 @@ production: &base
+@@ -89,7 +89,7 @@ production: &base
#- 2001:0db8::/32
# Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
@@ -49,7 +49,7 @@
## Date & Time settings
# Uncomment and customize if you want to change the default time zone of GitLab application.
-@@ -105,15 +105,15 @@ production: &base
+@@ -109,15 +109,15 @@ production: &base
# enabled: false
# S/MIME private key file in PEM format, unencrypted
# Default is '.gitlab_smime_key' relative to Rails.root (i.e. root of the GitLab app).
@@ -66,10 +66,10 @@
- # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
+ # Email server smtp settings are in /etc/webapps/gitlab/smtp_settings.rb
+ # File location to read encrypted SMTP secrets from
+ # email_smtp_secret_file: /mnt/gitlab/smtp.yaml.enc # Default: shared/encrypted_settings/smtp.yaml.enc
- # default_can_create_group: false # default: true
- # username_changing_enabled: false # default: true - User can change their username/namespace
-@@ -159,7 +159,7 @@ production: &base
+@@ -165,7 +165,7 @@ production: &base
## Repository downloads directory
# When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
# The default is 'shared/cache/archive/' relative to the root of the Rails app.
@@ -78,7 +78,7 @@
## Impersonation settings
impersonation_enabled: true
-@@ -208,7 +208,7 @@ production: &base
+@@ -214,7 +214,7 @@ production: &base
# Since `mail_room` is run independently of Rails, an absolute path is preferred.
# The default is 'log/mail_room_json.log' relative to the root of the Rails app.
#
@@ -87,7 +87,7 @@
# Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
expunge_deleted: false
-@@ -254,7 +254,7 @@ production: &base
+@@ -260,7 +260,7 @@ production: &base
artifacts:
enabled: true
# The location where build artifacts are stored (default: shared/artifacts).
@@ -96,7 +96,7 @@
# object_store:
# enabled: false
# remote_directory: artifacts # The bucket name
-@@ -274,7 +274,7 @@ production: &base
+@@ -280,7 +280,7 @@ production: &base
# be stored on disk, or in object storage
enabled: false
# The location where external diffs are stored (default: shared/lfs-external-diffs).
@@ -105,7 +105,7 @@
# object_store:
# enabled: false
# remote_directory: external-diffs
-@@ -290,7 +290,7 @@ production: &base
+@@ -296,7 +296,7 @@ production: &base
lfs:
enabled: true
# The location where LFS objects are stored (default: shared/lfs-objects).
@@ -114,7 +114,7 @@
object_store:
enabled: false
remote_directory: lfs-objects # Bucket name
-@@ -334,7 +334,7 @@ production: &base
+@@ -340,7 +340,7 @@ production: &base
enabled: true
dpkg_deb_path: /usr/bin/dpkg-deb
# The location where build packages are stored (default: shared/packages).
@@ -123,7 +123,7 @@
object_store:
enabled: false
remote_directory: packages # The bucket name
-@@ -355,7 +355,7 @@ production: &base
+@@ -361,7 +361,7 @@ production: &base
dependency_proxy:
enabled: true
# The location where build packages are stored (default: shared/dependency_proxy).
@@ -132,7 +132,7 @@
object_store:
enabled: false
remote_directory: dependency_proxy # The bucket name
-@@ -376,7 +376,7 @@ production: &base
+@@ -382,7 +382,7 @@ production: &base
terraform_state:
enabled: true
# The location where Terraform state files are stored (default: shared/terraform_state).
@@ -141,7 +141,7 @@
object_store:
enabled: false
remote_directory: terraform # The bucket name
-@@ -395,7 +395,7 @@ production: &base
+@@ -401,7 +401,7 @@ production: &base
enabled: false
access_control: false
# The location where pages are stored (default: shared/pages).
@@ -150,7 +150,7 @@
# The domain under which the pages are served:
# http://group.example.com/project
-@@ -409,7 +409,7 @@ production: &base
+@@ -415,7 +415,7 @@ production: &base
# File that contains the shared secret key for verifying access for gitlab-pages.
# Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -159,7 +159,7 @@
object_store:
enabled: false
remote_directory: pages # The bucket name
-@@ -577,7 +577,7 @@ production: &base
+@@ -586,7 +586,7 @@ production: &base
# port: 5005
# api_url: http://localhost:5000/ # internal address to the registry, will be used by GitLab to directly communicate with API
# key: config/registry.key
@@ -168,7 +168,7 @@
# issuer: gitlab-issuer
# notification_secret: '' # only set it when you use Geo replication feature without built-in Registry
-@@ -634,7 +634,7 @@ production: &base
+@@ -643,7 +643,7 @@ production: &base
# add_pusher: true
# The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root
@@ -177,7 +177,7 @@
#
# 3. Auth settings
-@@ -1089,7 +1089,7 @@ production: &base
+@@ -1098,7 +1098,7 @@ production: &base
# Shared file storage settings
shared:
@@ -186,7 +186,7 @@
# Encrypted Settings configuration
encrypted_settings:
-@@ -1114,13 +1114,13 @@ production: &base
+@@ -1123,13 +1123,13 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@@ -203,7 +203,7 @@
# gitaly_backup_path: # Path of the gitaly-backup binary (default: searches $PATH)
# archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600)
# keep_time: 604800 # default: 0 (forever) (in seconds)
-@@ -1162,12 +1162,12 @@ production: &base
+@@ -1171,12 +1171,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -219,7 +219,7 @@
# Git over HTTP
upload_pack: true
-@@ -1182,13 +1182,13 @@ production: &base
+@@ -1191,13 +1191,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).
@@ -235,7 +235,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1198,7 +1198,7 @@ production: &base
+@@ -1207,7 +1207,7 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -245,7 +245,7 @@
## Git settings
# CAUTION!
diff --git a/config/puma.rb.example b/config/puma.rb.example
-index f659529f23f..1d570986f41 100644
+index c70baf6570e..1dce6a00c16 100644
--- a/config/puma.rb.example
+++ b/config/puma.rb.example
@@ -5,11 +5,11 @@
Modified: fixes.patch
===================================================================
--- fixes.patch 2021-08-24 17:04:27 UTC (rev 1004646)
+++ fixes.patch 2021-08-24 17:27:08 UTC (rev 1004647)
@@ -1,4 +1,4 @@
-commit 7bb2e4711410cdff372e486b91a01e110b8331d0
+commit 8902d7ad27ebf0efd4d1886dc1ff0420840c3d94
Author: Anatol Pomozov <anatol.pomozov at gmail.com>
Date: Sat Mar 21 09:13:31 2020 -0700
@@ -5,7 +5,7 @@
ArchLinux fixes
diff --git a/Gemfile b/Gemfile
-index 68e4f2df1ff..32395440994 100644
+index 83b1b0ba25e..0e7a83213b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -324,6 +324,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development
More information about the arch-commits
mailing list