[arch-commits] Commit in gitlab/trunk (PKGBUILD configs.patch fixes.patch)

[Anatol Pomozov]

    Date: Monday, July 26, 2021 @ 17:12:41
  Author: anatolik
Revision: 985554

upgpkg: gitlab 14.1.0-1

Modified:
  gitlab/trunk/PKGBUILD
  gitlab/trunk/configs.patch
  gitlab/trunk/fixes.patch

---------------+
 PKGBUILD      |    6 +++---
 configs.patch |   16 ++++++++--------
 fixes.patch   |    6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-26 17:07:26 UTC (rev 985553)
+++ PKGBUILD	2021-07-26 17:12:41 UTC (rev 985554)
@@ -8,7 +8,7 @@
 # Contributor: Caleb Maclennan <caleb at alerque.com>
 
 pkgname=gitlab
-pkgver=14.0.5
+pkgver=14.1.0
 pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
@@ -40,8 +40,8 @@
         gitlab.logrotate)
 install='gitlab.install'
 sha512sums=('SKIP'
-            '5a9d150f1cdefbf27ce8242c620a0f17a6b1b09d8777da96e06139be425bf7150e4d24e899356b61f7c3b22f76f1ae911fc3a99eb65cc5f3c76c1cc88cfb2eb3'
-            '46c89b3345425c508610d93534b18047daf320eeaa025c32d7158025fb081f3a0e5a63461058fc835e7bcd593a95d34b25f98d272d98929e3bb85634e23adf48'
+            'e90176d2dd074caa38060e65eb8fe520f82badb41e9159aeac2c8720b06bcb1c9d21e47865ead3c028431a570e640dd3421f9210b339bd9a2a33e7fadf3759b8'
+            '5bce138c8fe22eec324fb93b53b99221a3ee4ba944f8ac6327aa49b24dfac74459eb271da5d5edae64eea4c6eedd44eaf2c73fa247c0591b99316df7b9e488d7'
             '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
             '451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba'
             '419848c668928276620b5229e457a39e0ed7e111f1da68a30c3e0ae1a644af1c869b004b35435ccec4ddcdf6cf7418b1ab71e6e2ee8a2c861c6625c8bfd908f6'

Modified: configs.patch
===================================================================
--- configs.patch	2021-07-26 17:07:26 UTC (rev 985553)
+++ configs.patch	2021-07-26 17:12:41 UTC (rev 985554)
@@ -1,4 +1,4 @@
-commit 054ff3794095abad9de651b1016a0e9ff2772d31
+commit 6df43c9b41e0f03a22c9592f228c4d9ec9f8cd07
 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 c9b056ce956..4b17173d560 100644
+index f63c42be6ee..a7970d48da8 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
 @@ -85,7 +85,7 @@ production: &base
@@ -177,7 +177,7 @@
  
    #
    # 3. Auth settings
-@@ -1084,7 +1084,7 @@ production: &base
+@@ -1089,7 +1089,7 @@ production: &base
  
    # Shared file storage settings
    shared:
@@ -186,7 +186,7 @@
  
    # Encrypted Settings configuration
    encrypted_settings:
-@@ -1109,13 +1109,13 @@ production: &base
+@@ -1114,13 +1114,13 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -200,10 +200,10 @@
    backup:
 -    path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
 +    path: "/var/lib/gitlab/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
+     # 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)
-     # pg_schema: public     # default: nil, it means that all schemas will be backed up
-@@ -1156,12 +1156,12 @@ production: &base
+@@ -1162,12 +1162,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -219,7 +219,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1176,13 +1176,13 @@ production: &base
+@@ -1182,13 +1182,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
-@@ -1192,7 +1192,7 @@ production: &base
+@@ -1198,7 +1198,7 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:

Modified: fixes.patch
===================================================================
--- fixes.patch	2021-07-26 17:07:26 UTC (rev 985553)
+++ fixes.patch	2021-07-26 17:12:41 UTC (rev 985554)
@@ -1,4 +1,4 @@
-commit 2b4afec9f36052a62216e9d377389afbf7db6577
+commit 7bb2e4711410cdff372e486b91a01e110b8331d0
 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 c55cea60e31..4c8476b39fc 100644
+index 68e4f2df1ff..32395440994 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -328,6 +328,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development
+@@ -324,6 +324,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development
  
  gem 'batch-loader', '~> 2.0.1'