From 6e36401fc38257e8b229568651766684525da7af Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 27 Mar 2020 22:28:57 +0100 Subject: [PATCH 1/4] 12.9.1 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fca6e04..650127e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to GitLab is a web-based Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features, using an open-source license, developed by GitLab Inc. -**Shipped version:** 12.9.0 +**Shipped version:** 12.9.1 ## Screenshots diff --git a/manifest.json b/manifest.json index 53a0251..c4930b1 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.9.0~ynh1", + "version": "12.9.1~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 38a0345..6271519 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.9.0" +gitlab_version="12.9.1" -gitlab_x86_64_source_sha256="fe547cd70cbc8cb89314e4ee69c96100cc34d9df476ba021ce5c036bb28bf501" +gitlab_x86_64_source_sha256="57f38c95abce48211a51fd6f58f3adc7aab367690f4e860f821e60b2e42a27f5" -gitlab_arm_source_sha256="5865793add5e88c30d517234bd25795a489fa82f560406fbf715e460611e8a0f" +gitlab_arm_source_sha256="37190935887455ee296f09c15b5ffce7c6077151ebdae45a0b5b175c22996695" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 11b31142fa6c915aedeb7106a818df5e12f40c85 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 28 Mar 2020 21:28:05 +0100 Subject: [PATCH 2/4] Add badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 650127e..85b3256 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Gitlab for Yunohost -[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) +[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab)![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) [![Install gitlab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) > *This package allow you to install gitlab quickly and simply on a YunoHost server. From 5b2d8553f3a233b5909dd38b79ccbbe9d9e39f68 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 28 Mar 2020 21:28:44 +0100 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85b3256..3a24289 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Gitlab for Yunohost -[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab)![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) [![Install gitlab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) > *This package allow you to install gitlab quickly and simply on a YunoHost server. From a3659c59704a494c374b02ed461870a8778d66d7 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 2 Apr 2020 13:47:53 +0200 Subject: [PATCH 4/4] 12.9.2 --- README.md | 2 +- conf/gitlab.rb | 4 ++++ manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3a24289..1c5cc25 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to GitLab is a web-based Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features, using an open-source license, developed by GitLab Inc. -**Shipped version:** 12.9.1 +**Shipped version:** 12.9.2 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 3decff9..cc49018 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -331,6 +331,10 @@ external_url '__GENERATED_EXTERNAL_URL__' ### Usage Statistics # gitlab_rails['usage_ping_enabled'] = true +### Seat Link setting +###! Docs: https://docs.gitlab.com/ee/subscriptions/index.html#seat-link +# gitlab_rails['seat_link_enabled'] = true + ### GitLab Mattermost ###! These settings are void if Mattermost is installed on the same omnibus ###! install diff --git a/manifest.json b/manifest.json index c4930b1..03e0db3 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.9.1~ynh1", + "version": "12.9.2~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 6271519..1f51378 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.9.1" +gitlab_version="12.9.2" -gitlab_x86_64_source_sha256="57f38c95abce48211a51fd6f58f3adc7aab367690f4e860f821e60b2e42a27f5" +gitlab_x86_64_source_sha256="781d21de10c4b88582d25af19cd3d85d9618a995f930d1954ea9dc0fa76d7ea9" -gitlab_arm_source_sha256="37190935887455ee296f09c15b5ffce7c6077151ebdae45a0b5b175c22996695" +gitlab_arm_source_sha256="09eb415d2e55af64294606e25cfebd508c8cc59218475ed26e99f6baccfe1218" gitlab_filename="gitlab-ce-${gitlab_version}.deb"