[arch-commits] Commit in gitlab/trunk (PKGBUILD configs.patch fixes.patch)
Anatol Pomozov
anatolik at archlinux.org
Mon May 10 17:23:32 UTC 2021
Date: Monday, May 10, 2021 @ 17:23:32
Author: anatolik
Revision: 929576
upgpkg: gitlab 13.11.3-1
Modified:
gitlab/trunk/PKGBUILD
gitlab/trunk/configs.patch
gitlab/trunk/fixes.patch
---------------+
PKGBUILD | 6 +++---
configs.patch | 55 ++++++++++++++++++-------------------------------------
fixes.patch | 6 +++---
3 files changed, 24 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-10 17:08:58 UTC (rev 929575)
+++ PKGBUILD 2021-05-10 17:23:32 UTC (rev 929576)
@@ -8,7 +8,7 @@
# Contributor: Caleb Maclennan <caleb at alerque.com>
pkgname=gitlab
-pkgver=13.10.4
+pkgver=13.11.3
pkgrel=1
pkgdesc="Project management and code hosting application"
arch=('x86_64')
@@ -40,8 +40,8 @@
gitlab.logrotate)
install='gitlab.install'
sha512sums=('SKIP'
- 'a50f76a24b0f2ece42f67a8bf194617e025c95f14e2010a5f91b3b1ae00ba81a4f1d8a067cec0d549820aa0a6df7eae029f93b81a2e1f339f9e80429cd4d8d37'
- 'd8800af5b58e25a7baba9d4aba024715afe166919532b2919b29fc4f8901049ec467f87000fa11f448feddf4f423b39248e97129e3677bdbd980de260104fe8c'
+ '4b68e99a170bd5d585ba6efc5fb153a9b6a355d359f21b1b2e91eb8a0e4a7dd5771a66d412c8c6895ed32b24a98e04d87e26ed5156ac9a0f77901d2c75ba7808'
+ 'f8f9fd90c35b58828c7aeeaae920909f3b32d27c0112919aaa116a248764037d65388c61687d4b654bf03533a12c600876e2f173525f6696dfdfb0b7891f78aa'
'5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
'451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba'
'419848c668928276620b5229e457a39e0ed7e111f1da68a30c3e0ae1a644af1c869b004b35435ccec4ddcdf6cf7418b1ab71e6e2ee8a2c861c6625c8bfd908f6'
Modified: configs.patch
===================================================================
--- configs.patch 2021-05-10 17:08:58 UTC (rev 929575)
+++ configs.patch 2021-05-10 17:23:32 UTC (rev 929576)
@@ -1,4 +1,4 @@
-commit 3e313894380af46476b8ef5859bcd653defba3c4
+commit 17ec7dfcca6e74cee6fa8b6bf958e50ae1460783
Author: Anatol Pomozov <anatol.pomozov at gmail.com>
Date: Tue May 26 00:01:38 2020 -0700
@@ -37,7 +37,7 @@
host: localhost
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 57ece521301..c3725baccdf 100644
+index da1a15302da..282fb806868 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -85,7 +85,7 @@ production: &base
@@ -87,7 +87,7 @@
# Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
expunge_deleted: false
-@@ -244,7 +244,7 @@ production: &base
+@@ -251,7 +251,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
-@@ -264,7 +264,7 @@ production: &base
+@@ -271,7 +271,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
-@@ -280,7 +280,7 @@ production: &base
+@@ -287,7 +287,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
-@@ -324,7 +324,7 @@ production: &base
+@@ -331,7 +331,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
-@@ -345,7 +345,7 @@ production: &base
+@@ -352,7 +352,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
-@@ -366,7 +366,7 @@ production: &base
+@@ -373,7 +373,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
-@@ -385,7 +385,7 @@ production: &base
+@@ -392,7 +392,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
-@@ -399,7 +399,7 @@ production: &base
+@@ -406,7 +406,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
-@@ -557,7 +557,7 @@ production: &base
+@@ -568,7 +568,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
-@@ -614,7 +614,7 @@ production: &base
+@@ -625,7 +625,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
-@@ -1064,7 +1064,7 @@ production: &base
+@@ -1075,7 +1075,7 @@ production: &base
# Shared file storage settings
shared:
@@ -186,7 +186,7 @@
# Encrypted Settings configuration
encrypted_settings:
-@@ -1073,7 +1073,7 @@ production: &base
+@@ -1084,7 +1084,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@@ -195,7 +195,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,13 +1091,13 @@ production: &base
+@@ -1102,13 +1102,13 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@@ -212,7 +212,7 @@
# archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600)
# keep_time: 604800 # default: 0 (forever) (in seconds)
# pg_schema: public # default: nil, it means that all schemas will be backed up
-@@ -1138,12 +1138,12 @@ production: &base
+@@ -1149,12 +1149,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -228,7 +228,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).
@@ -244,7 +244,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1174,7 +1174,7 @@ production: &base
+@@ -1185,7 +1185,7 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -253,25 +253,6 @@
## Git settings
# CAUTION!
-diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
-index bd37080b1c8..f956e786071 100644
---- a/config/initializers/smtp_settings.rb.sample
-+++ b/config/initializers/smtp_settings.rb.sample
-@@ -1,13 +1,6 @@
--# To enable smtp email delivery for your GitLab instance do the following:
--# 1. Rename this file to smtp_settings.rb
--# 2. Edit settings inside this file
--# 3. Restart GitLab instance
--#
- # For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html
--#
--# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
-
--if Rails.env.production?
-+if false # To enable SMTP please replace 'false' with 'Rails.env.production?'
- Rails.application.config.action_mailer.delivery_method = :smtp
-
- ActionMailer::Base.delivery_method = :smtp
diff --git a/config/puma.rb.example b/config/puma.rb.example
index 9fc354a8fe8..e665079117e 100644
--- a/config/puma.rb.example
Modified: fixes.patch
===================================================================
--- fixes.patch 2021-05-10 17:08:58 UTC (rev 929575)
+++ fixes.patch 2021-05-10 17:23:32 UTC (rev 929576)
@@ -1,4 +1,4 @@
-commit 51405248742974cae7c9d03eedb3a8d43cc48864
+commit 3ab62ab3f323a52b2eb5ce4da999c7f6af162cb3
Author: Anatol Pomozov <anatol.pomozov at gmail.com>
Date: Sat Mar 21 09:13:31 2020 -0700
@@ -5,10 +5,10 @@
ArchLinux fixes
diff --git a/Gemfile b/Gemfile
-index 81294ebe39e..9c189527de3 100644
+index 876bcfaabf9..05097465399 100644
--- a/Gemfile
+++ b/Gemfile
-@@ -326,6 +326,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development
+@@ -325,6 +325,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development
gem 'batch-loader', '~> 2.0.1'
More information about the arch-commits
mailing list