Date: Monday, June 21, 2021 @ 18:30:56 Author: anatolik Revision: 966557
upgpkg: gitlab 14.0.0-1 Modified: gitlab/trunk/PKGBUILD gitlab/trunk/configs.patch gitlab/trunk/fixes.patch ---------------+ PKGBUILD | 6 +++--- configs.patch | 51 +++++++++++++++++++++------------------------------ fixes.patch | 6 +++--- 3 files changed, 27 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-21 18:11:40 UTC (rev 966556) +++ PKGBUILD 2021-06-21 18:30:56 UTC (rev 966557) @@ -8,7 +8,7 @@ # Contributor: Caleb Maclennan <ca...@alerque.com> pkgname=gitlab -pkgver=13.12.3 +pkgver=14.0.0 pkgrel=1 pkgdesc="Project management and code hosting application" arch=('x86_64') @@ -40,8 +40,8 @@ gitlab.logrotate) install='gitlab.install' sha512sums=('SKIP' - '4b68e99a170bd5d585ba6efc5fb153a9b6a355d359f21b1b2e91eb8a0e4a7dd5771a66d412c8c6895ed32b24a98e04d87e26ed5156ac9a0f77901d2c75ba7808' - 'f8f9fd90c35b58828c7aeeaae920909f3b32d27c0112919aaa116a248764037d65388c61687d4b654bf03533a12c600876e2f173525f6696dfdfb0b7891f78aa' + '5a9d150f1cdefbf27ce8242c620a0f17a6b1b09d8777da96e06139be425bf7150e4d24e899356b61f7c3b22f76f1ae911fc3a99eb65cc5f3c76c1cc88cfb2eb3' + '46c89b3345425c508610d93534b18047daf320eeaa025c32d7158025fb081f3a0e5a63461058fc835e7bcd593a95d34b25f98d272d98929e3bb85634e23adf48' '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067' '451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba' '419848c668928276620b5229e457a39e0ed7e111f1da68a30c3e0ae1a644af1c869b004b35435ccec4ddcdf6cf7418b1ab71e6e2ee8a2c861c6625c8bfd908f6' Modified: configs.patch =================================================================== --- configs.patch 2021-06-21 18:11:40 UTC (rev 966556) +++ configs.patch 2021-06-21 18:30:56 UTC (rev 966557) @@ -1,4 +1,4 @@ -commit 17ec7dfcca6e74cee6fa8b6bf958e50ae1460783 +commit 054ff3794095abad9de651b1016a0e9ff2772d31 Author: Anatol Pomozov <anatol.pomo...@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 da1a15302da..282fb806868 100644 +index c9b056ce956..4b17173d560 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -85,7 +85,7 @@ production: &base @@ -78,7 +78,7 @@ ## Impersonation settings impersonation_enabled: true -@@ -205,7 +205,7 @@ production: &base +@@ -208,7 +208,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 -@@ -251,7 +251,7 @@ production: &base +@@ -254,7 +254,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 -@@ -271,7 +271,7 @@ production: &base +@@ -274,7 +274,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 -@@ -287,7 +287,7 @@ production: &base +@@ -290,7 +290,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 -@@ -331,7 +331,7 @@ production: &base +@@ -334,7 +334,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 -@@ -352,7 +352,7 @@ production: &base +@@ -355,7 +355,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 -@@ -373,7 +373,7 @@ production: &base +@@ -376,7 +376,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 -@@ -392,7 +392,7 @@ production: &base +@@ -395,7 +395,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 -@@ -406,7 +406,7 @@ production: &base +@@ -409,7 +409,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 -@@ -568,7 +568,7 @@ production: &base +@@ -577,7 +577,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 -@@ -625,7 +625,7 @@ production: &base +@@ -634,7 +634,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 -@@ -1075,7 +1075,7 @@ production: &base +@@ -1084,7 +1084,7 @@ production: &base # Shared file storage settings shared: @@ -186,16 +186,7 @@ # Encrypted Settings configuration encrypted_settings: -@@ -1084,7 +1084,7 @@ production: &base - # Gitaly settings - gitaly: - # Path to the directory containing Gitaly client executables. -- client_path: /home/git/gitaly -+ client_path: /usr/bin - # 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. -@@ -1102,13 +1102,13 @@ production: &base +@@ -1109,13 +1109,13 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -212,7 +203,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 -@@ -1149,12 +1149,12 @@ production: &base +@@ -1156,12 +1156,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -228,7 +219,7 @@ # Git over HTTP upload_pack: true -@@ -1169,13 +1169,13 @@ production: &base +@@ -1176,13 +1176,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 +235,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1185,7 +1185,7 @@ production: &base +@@ -1192,7 +1192,7 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -254,7 +245,7 @@ ## Git settings # CAUTION! diff --git a/config/puma.rb.example b/config/puma.rb.example -index 9fc354a8fe8..e665079117e 100644 +index f659529f23f..1d570986f41 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -5,11 +5,11 @@ @@ -289,8 +280,8 @@ on_restart do # Signal application hooks that we're about to restart -@@ -80,7 +80,7 @@ if defined?(nakayoshi_fork) - end +@@ -76,7 +76,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 -require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" Modified: fixes.patch =================================================================== --- fixes.patch 2021-06-21 18:11:40 UTC (rev 966556) +++ fixes.patch 2021-06-21 18:30:56 UTC (rev 966557) @@ -1,4 +1,4 @@ -commit 3ab62ab3f323a52b2eb5ce4da999c7f6af162cb3 +commit 2b4afec9f36052a62216e9d377389afbf7db6577 Author: Anatol Pomozov <anatol.pomo...@gmail.com> Date: Sat Mar 21 09:13:31 2020 -0700 @@ -5,10 +5,10 @@ ArchLinux fixes diff --git a/Gemfile b/Gemfile -index 876bcfaabf9..05097465399 100644 +index c55cea60e31..4c8476b39fc 100644 --- a/Gemfile +++ b/Gemfile -@@ -325,6 +325,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development +@@ -328,6 +328,9 @@ gem 'gettext', '~> 3.3', require: false, group: :development gem 'batch-loader', '~> 2.0.1'