Date: Thursday, March 23, 2023 @ 23:35:29 Author: anatolik Revision: 1427416
upgpkg: gitlab 15.10.0-1 Modified: gitlab/trunk/PKGBUILD gitlab/trunk/configs.patch gitlab/trunk/fixes.patch ---------------+ PKGBUILD | 6 +-- configs.patch | 99 ++++++++++++++++++++++++++++++++++++++------------------ fixes.patch | 6 +-- 3 files changed, 74 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-23 23:35:27 UTC (rev 1427415) +++ PKGBUILD 2023-03-23 23:35:29 UTC (rev 1427416) @@ -8,7 +8,7 @@ # Contributor: Caleb Maclennan <[email protected]> pkgname=gitlab -pkgver=15.8.3 +pkgver=15.10.0 pkgrel=1 pkgdesc="Project management and code hosting application" arch=('x86_64') @@ -40,8 +40,8 @@ gitlab.logrotate) install='gitlab.install' sha512sums=('SKIP' - 'cd93f745f908800237034f639f1776e4d3111c4375d93e3d44be9b4b25f2e3a39ffaa43c70c3d32e1b534cbc968694288e742ff4052e5f2091cb74cf441170c6' - '3eb5058d6edc2d16f5558a3ee485ba796aa64fb4b9eb7595390322344b809fcb47a45be9d7fe36c822ac2724aeecb2905a0ea9a868a56349ac2bc5c8c9f070e3' + '504ab3130f8465521e0eeca8a9885ad04bec01933f71637cd439faaa5b0be783a3e8f48f0337d41e36f2de40d94b3771747684bb3eada63a073f5f9c1d38ad22' + '7384a7cb995832be3643e1f8b16f9454c6ef04ff1e0dc1a3aed3ad849d11d0be7f573c024c4d867d69e726fceccea1a58c9c3074ef166291b8357b3fc30922a8' '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067' '451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba' '419848c668928276620b5229e457a39e0ed7e111f1da68a30c3e0ae1a644af1c869b004b35435ccec4ddcdf6cf7418b1ab71e6e2ee8a2c861c6625c8bfd908f6' Modified: configs.patch =================================================================== --- configs.patch 2023-03-23 23:35:27 UTC (rev 1427415) +++ configs.patch 2023-03-23 23:35:29 UTC (rev 1427416) @@ -1,4 +1,4 @@ -commit e7a0fa0d0768872bac6912cd73600d81ab44e5fa +commit e081b38ba9c918db344bf9a86b2672f7e175f3df Author: Anatol Pomozov <[email protected]> Date: Tue May 26 00:01:38 2020 -0700 @@ -15,7 +15,7 @@ will cause a conflict that needs to be reviewed manually. diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql -index 5329a8e9fd7a..19c33fdd1f56 100644 +index c1b1247b5b08..19c33fdd1f56 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -6,7 +6,7 @@ production: @@ -27,10 +27,18 @@ password: "secure password" host: localhost # load_balancing: -@@ -18,13 +18,6 @@ production: +@@ -18,21 +18,6 @@ production: # port: 8600 # record: secondary.postgresql.service.consul # interval: 300 +- # ci: +- # adapter: postgresql +- # encoding: unicode +- # database: gitlabhq_production +- # database_tasks: false +- # username: git +- # password: "secure password" +- # host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -41,10 +49,20 @@ # # Development specific -@@ -39,13 +32,6 @@ development: +@@ -47,23 +32,6 @@ development: host: localhost variables: statement_timeout: 15s +- # ci: +- # adapter: postgresql +- # encoding: unicode +- # database: gitlabhq_development +- # database_tasks: false +- # username: postgres +- # password: "secure password" +- # host: localhost +- # variables: +- # statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -55,7 +73,7 @@ # # Staging specific -@@ -55,14 +41,7 @@ staging: +@@ -73,22 +41,7 @@ staging: adapter: postgresql encoding: unicode database: gitlabhq_staging @@ -62,6 +80,14 @@ - username: git - password: "secure password" - host: localhost +- # ci: +- # adapter: postgresql +- # encoding: unicode +- # database: gitlabhq_staging +- # database_tasks: false +- # username: git +- # password: "secure password" +- # host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -71,10 +97,21 @@ password: "secure password" host: localhost -@@ -80,10 +59,3 @@ test: &test +@@ -106,21 +59,3 @@ test: &test prepared_statements: false variables: statement_timeout: 15s +- # ci: +- # adapter: postgresql +- # encoding: unicode +- # database: gitlabhq_test +- # database_tasks: false +- # username: postgres +- # password: +- # host: localhost +- # prepared_statements: false +- # variables: +- # statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -83,7 +120,7 @@ - password: - host: localhost diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 841e7670e454..973c572e79e4 100644 +index e8a88628a8ac..44bae1866848 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -91,7 +91,7 @@ production: &base @@ -124,7 +161,7 @@ ## Impersonation settings impersonation_enabled: true -@@ -218,7 +218,7 @@ production: &base +@@ -234,7 +234,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. # @@ -131,9 +168,9 @@ - # log_path: log/mail_room_json.log + log_path: /var/log/gitlab/mail_room_json.log - # Whether to expunge (permanently remove) messages from the mailbox when they are marked as deleted after delivery - expunge_deleted: false -@@ -248,7 +248,7 @@ production: &base + # If you are using Microsoft Graph instead of IMAP, set this to false to retain + # messages in the inbox since deleted messages are auto-expunged after some time. +@@ -269,7 +269,7 @@ production: &base # contains the shared secret key for verifying access for mailroom's # incoming_email. # Default is '.gitlab_mailroom_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -140,9 +177,9 @@ - # secret_file: /home/git/gitlab/.gitlab_mailroom_secret + # secret_file: /var/lib/gitlab/.gitlab_mailroom_secret - ## Consolidated object store config - ## This will only take effect if the object_store sections are not defined -@@ -284,7 +284,7 @@ production: &base + # File location to read encrypted incoming email secrets from + # encrypted_secret_file: /mnt/gitlab/smtp.yaml.enc +@@ -309,7 +309,7 @@ production: &base artifacts: enabled: true # The location where build artifacts are stored (default: shared/artifacts). @@ -151,7 +188,7 @@ # object_store: # enabled: false # remote_directory: artifacts # The bucket name -@@ -303,7 +303,7 @@ production: &base +@@ -328,7 +328,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). @@ -160,7 +197,7 @@ # object_store: # enabled: false # remote_directory: external-diffs -@@ -318,7 +318,7 @@ production: &base +@@ -343,7 +343,7 @@ production: &base lfs: enabled: true # The location where LFS objects are stored (default: shared/lfs-objects). @@ -169,7 +206,7 @@ object_store: enabled: false remote_directory: lfs-objects # Bucket name -@@ -358,7 +358,7 @@ production: &base +@@ -383,7 +383,7 @@ production: &base enabled: true dpkg_deb_path: /usr/bin/dpkg-deb # The location where build packages are stored (default: shared/packages). @@ -178,7 +215,7 @@ object_store: enabled: false remote_directory: packages # The bucket name -@@ -377,7 +377,7 @@ production: &base +@@ -402,7 +402,7 @@ production: &base dependency_proxy: enabled: true # The location where build packages are stored (default: shared/dependency_proxy). @@ -187,7 +224,7 @@ object_store: enabled: false remote_directory: dependency_proxy # The bucket name -@@ -396,7 +396,7 @@ production: &base +@@ -421,7 +421,7 @@ production: &base terraform_state: enabled: true # The location where Terraform state files are stored (default: shared/terraform_state). @@ -196,7 +233,7 @@ object_store: enabled: false remote_directory: terraform # The bucket name -@@ -432,7 +432,7 @@ production: &base +@@ -457,7 +457,7 @@ production: &base enabled: false access_control: false # The location where pages are stored (default: shared/pages). @@ -205,7 +242,7 @@ # The domain under which the pages are served: # http://group.example.com/project -@@ -446,7 +446,7 @@ production: &base +@@ -471,7 +471,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). @@ -214,7 +251,7 @@ object_store: enabled: false remote_directory: pages # The bucket name -@@ -612,7 +612,7 @@ production: &base +@@ -662,7 +662,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 @@ -223,8 +260,8 @@ # issuer: gitlab-issuer # notification_secret: '' # only set it when you use Geo replication feature without built-in Registry -@@ -669,7 +669,7 @@ production: &base - # add_pusher: true +@@ -713,7 +713,7 @@ production: &base + # Default project notifications settings: # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root - # builds_path: builds/ @@ -232,7 +269,7 @@ # # 3. Auth settings -@@ -1135,7 +1135,7 @@ production: &base +@@ -1179,7 +1179,7 @@ production: &base # Shared file storage settings shared: @@ -241,7 +278,7 @@ # Encrypted Settings configuration encrypted_settings: -@@ -1160,14 +1160,14 @@ production: &base +@@ -1204,14 +1204,14 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -260,7 +297,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 -@@ -1202,12 +1202,12 @@ production: &base +@@ -1246,12 +1246,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -276,7 +313,7 @@ # Git over HTTP upload_pack: true -@@ -1222,13 +1222,13 @@ production: &base +@@ -1266,13 +1266,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). @@ -292,7 +329,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1241,7 +1241,7 @@ production: &base +@@ -1290,7 +1290,7 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -302,7 +339,7 @@ ## Git settings # CAUTION! diff --git a/config/puma.rb.example b/config/puma.rb.example -index c70baf6570e6..1dce6a00c165 100644 +index 59844b4aecff..0560d761e239 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -5,11 +5,11 @@ @@ -337,7 +374,7 @@ on_restart do # Signal application hooks that we're about to restart -@@ -76,7 +76,7 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_ +@@ -81,7 +81,7 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_ nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true' # Use json formatter Modified: fixes.patch =================================================================== --- fixes.patch 2023-03-23 23:35:27 UTC (rev 1427415) +++ fixes.patch 2023-03-23 23:35:29 UTC (rev 1427416) @@ -1,4 +1,4 @@ -commit 12f6321d679fb5aedef23680bb618a1443146c4f +commit 10813335106d5f6b78c2e19b2a4118e046bc1a43 Author: Anatol Pomozov <[email protected]> Date: Sat Mar 21 09:13:31 2020 -0700 @@ -5,10 +5,10 @@ ArchLinux fixes diff --git a/Gemfile b/Gemfile -index 6f9340ebd7dc..1fb09413b91d 100644 +index 8cafe3b8909c..6da8084caa1b 100644 --- a/Gemfile +++ b/Gemfile -@@ -330,6 +330,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development +@@ -355,6 +355,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development gem 'batch-loader', '~> 2.0.1'
