Date: Tuesday, August 25, 2020 @ 16:31:34 Author: anatolik Revision: 688469
upgpkg: gitlab 13.3.1-1 Modified: gitlab/trunk/PKGBUILD gitlab/trunk/configs.patch ---------------+ PKGBUILD | 4 ++-- configs.patch | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 23 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-25 16:06:20 UTC (rev 688468) +++ PKGBUILD 2020-08-25 16:31:34 UTC (rev 688469) @@ -8,7 +8,7 @@ # Contributor: Caleb Maclennan <[email protected]> pkgname=gitlab -pkgver=13.2.6 +pkgver=13.3.1 pkgrel=1 pkgdesc="Project management and code hosting application" arch=('x86_64') @@ -40,7 +40,7 @@ gitlab.logrotate) install='gitlab.install' sha512sums=('SKIP' - '4fbc19b97cb9183e2f9b91a261b327262ba37dceff145ae4690ea0818dfb21175456f0ed174354b74cec0d186bb981087a1a590d51044c2a9c6034d94ee0727c' + '1a2f6d716bf1c6e3606914036fc46bb77a41292bd7ef8ec1f900206c2fe698baaf4e5a8f40e2f53ddcbb7a91158137c6b9f5c04fa619817c80eb158134359eb1' '3fc0919e2995f36da9a98fa74e83955f91854fd2e214f66f0a32054b77c83161063f8c05e1126e57e474eb0f2909970641ccc4d13eea9625f36bf56cdf0c75a4' '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067' '75bf9e5ad238a862dfc2638101fb74101227d88958a5f0fdf1ced3833e403f91b6a5908dfb97c5172f75748737212bf87d05b7d39bbe90ed5d3a6c248c1c1ab6' Modified: configs.patch =================================================================== --- configs.patch 2020-08-25 16:06:20 UTC (rev 688468) +++ configs.patch 2020-08-25 16:31:34 UTC (rev 688469) @@ -1,4 +1,4 @@ -commit 55143d718b2ed503faa2b302d6d246ce489c6d70 +commit 17e66564bddc95c8a81df1e21137fe84badb1641 Author: Anatol Pomozov <[email protected]> Date: Tue May 26 00:01:38 2020 -0700 @@ -15,22 +15,22 @@ will cause a conflict that needs to be reviewed manually. diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql -index 5b3b35c9226..afb139df97e 100644 +index 37c69ad326b..68415ea3f82 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql -@@ -6,7 +6,7 @@ production: +@@ -5,7 +5,7 @@ production: + adapter: postgresql encoding: unicode database: gitlabhq_production - pool: 10 - username: git + username: gitlab password: "secure password" host: localhost # load_balancing: -@@ -39,7 +39,7 @@ staging: +@@ -36,7 +36,7 @@ staging: + adapter: postgresql encoding: unicode database: gitlabhq_staging - pool: 10 - username: git + username: gitlab password: "secure password" @@ -37,7 +37,7 @@ host: localhost diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example -index 7ba256b39cd..e7792d43b60 100644 +index 5d217332634..aaf0428a5dd 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -83,7 +83,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 -@@ -236,7 +236,7 @@ production: &base +@@ -239,7 +239,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 -@@ -256,7 +256,7 @@ production: &base +@@ -259,7 +259,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 -@@ -272,7 +272,7 @@ production: &base +@@ -275,7 +275,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 -@@ -315,7 +315,7 @@ production: &base +@@ -318,7 +318,7 @@ production: &base packages: enabled: true # The location where build packages are stored (default: shared/packages). @@ -123,7 +123,7 @@ object_store: enabled: false remote_directory: packages # The bucket name -@@ -336,7 +336,7 @@ production: &base +@@ -339,7 +339,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 -@@ -357,7 +357,7 @@ production: &base +@@ -360,7 +360,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 -@@ -376,7 +376,7 @@ production: &base +@@ -379,7 +379,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 -@@ -390,7 +390,7 @@ production: &base +@@ -393,7 +393,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 @@ ## Mattermost ## For enabling Add to Mattermost button -@@ -526,7 +526,7 @@ production: &base +@@ -529,7 +529,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 -@@ -583,7 +583,7 @@ production: &base +@@ -586,7 +586,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 -@@ -993,12 +993,12 @@ production: &base +@@ -1001,12 +1001,12 @@ production: &base # Shared file storage settings shared: @@ -192,7 +192,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. -@@ -1016,13 +1016,13 @@ production: &base +@@ -1024,13 +1024,13 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -209,7 +209,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 -@@ -1063,12 +1063,12 @@ production: &base +@@ -1071,12 +1071,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -225,7 +225,7 @@ # Git over HTTP upload_pack: true -@@ -1083,11 +1083,11 @@ production: &base +@@ -1091,11 +1091,11 @@ 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).
