Date: Sunday, September 26, 2021 @ 20:18:10 Author: anatolik Revision: 1025698
upgpkg: gitlab 14.3.0-1 Modified: gitlab/trunk/PKGBUILD gitlab/trunk/configs.patch gitlab/trunk/fixes.patch ---------------+ PKGBUILD | 6 +++--- configs.patch | 50 +++++++++++++++++++++++++------------------------- fixes.patch | 4 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-09-26 20:02:51 UTC (rev 1025697) +++ PKGBUILD 2021-09-26 20:18:10 UTC (rev 1025698) @@ -8,7 +8,7 @@ # Contributor: Caleb Maclennan <[email protected]> pkgname=gitlab -pkgver=14.2.3 +pkgver=14.3.0 pkgrel=1 pkgdesc="Project management and code hosting application" arch=('x86_64') @@ -40,8 +40,8 @@ gitlab.logrotate) install='gitlab.install' sha512sums=('SKIP' - '77b261a9e3e780b8f10a7d2a4a8707a5339071bb0bc570eea57f9d95f826ca12f495701aa3b44b2bc88b513c938e82d4895f9cc7e6031eaf6d5d0161bf6814a2' - '33441a2748d4eb45e8053346f2e570aa164acf943c40249c26a19783b267127dd150c99990163219763066ffefebef644b1721c4beeca57f73e012ee2b2c4396' + '1f1adbb5a641ec9272931c823c7bf4822dde9df4242a039ec5916167742f1148f555bf05774b0eae69a7f52417092db4a7925cd553d43d37544713036da7f50b' + '7efb9a6f1aa0c05780f173dd61039e9bec2321ef1015e6ad11bc5ecbf83689be6c3af2a8e4b42bd216a0bfe9618f90c53ae92d6aabeb0563378f3bd62c95ac57' '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067' '451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba' '419848c668928276620b5229e457a39e0ed7e111f1da68a30c3e0ae1a644af1c869b004b35435ccec4ddcdf6cf7418b1ab71e6e2ee8a2c861c6625c8bfd908f6' Modified: configs.patch =================================================================== --- configs.patch 2021-09-26 20:02:51 UTC (rev 1025697) +++ configs.patch 2021-09-26 20:18:10 UTC (rev 1025698) @@ -1,4 +1,4 @@ -commit d9420c988705a7eec9e72e11e069d8955fdc1fb6 +commit 0757f389a34b9a58b46a8ecc508501bd4c3c3188 Author: Anatol Pomozov <[email protected]> Date: Tue May 26 00:01:38 2020 -0700 @@ -15,29 +15,29 @@ will cause a conflict that needs to be reviewed manually. diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql -index ca1ff4db1b4..7c6dbbf0a12 100644 +index a4daab1fd0c..19c33fdd1f5 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql -@@ -5,7 +5,7 @@ production: - adapter: postgresql - encoding: unicode - database: gitlabhq_production -- username: git -+ username: gitlab - password: "secure password" - host: localhost - # load_balancing: -@@ -38,7 +38,7 @@ staging: - adapter: postgresql - encoding: unicode - database: gitlabhq_staging -- username: git -+ username: gitlab - password: "secure password" - host: localhost +@@ -6,7 +6,7 @@ production: + adapter: postgresql + encoding: unicode + database: gitlabhq_production +- username: git ++ username: gitlab + password: "secure password" + host: localhost + # load_balancing: +@@ -41,7 +41,7 @@ staging: + adapter: postgresql + encoding: unicode + database: gitlabhq_staging +- username: git ++ username: gitlab + password: "secure password" + host: localhost diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index f7b1c2f7567..afb92b5d5b8 100644 +index a8881fd8a2e..23a24536da3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -89,7 +89,7 @@ production: &base @@ -177,7 +177,7 @@ # # 3. Auth settings -@@ -1098,7 +1098,7 @@ production: &base +@@ -1103,7 +1103,7 @@ production: &base # Shared file storage settings shared: @@ -186,7 +186,7 @@ # Encrypted Settings configuration encrypted_settings: -@@ -1123,13 +1123,13 @@ production: &base +@@ -1128,13 +1128,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) -@@ -1171,12 +1171,12 @@ production: &base +@@ -1184,12 +1184,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -219,7 +219,7 @@ # Git over HTTP upload_pack: true -@@ -1191,13 +1191,13 @@ production: &base +@@ -1204,13 +1204,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 -@@ -1207,7 +1207,7 @@ production: &base +@@ -1220,7 +1220,7 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: Modified: fixes.patch =================================================================== --- fixes.patch 2021-09-26 20:02:51 UTC (rev 1025697) +++ fixes.patch 2021-09-26 20:18:10 UTC (rev 1025698) @@ -1,4 +1,4 @@ -commit 8902d7ad27ebf0efd4d1886dc1ff0420840c3d94 +commit ec0738c3091f91465308a15051ecb5fc4dcd38c3 Author: Anatol Pomozov <[email protected]> Date: Sat Mar 21 09:13:31 2020 -0700 @@ -5,7 +5,7 @@ ArchLinux fixes diff --git a/Gemfile b/Gemfile -index 83b1b0ba25e..0e7a83213b2 100644 +index 39e61564968..d2564260ed5 100644 --- a/Gemfile +++ b/Gemfile @@ -324,6 +324,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development
