From 9e33457e7a3559fa485cc663285e51c52e95516f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Sep 2020 09:13:37 +0200 Subject: [PATCH 1/3] Update manifest.json Small typos --- manifest.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index e1a0747..4a4e46b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "Gitlab", + "name": "GitLab", "id": "gitlab", "packaging_format": 1, "version": "13.4.0~ynh1", @@ -26,8 +26,8 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain name for gitlab", - "fr": "Choisissez un nom de domaine pour gitlab" + "en": "Choose a domain name for GitLab", + "fr": "Choisissez un nom de domaine pour GitLab" }, "example": "example.com" }, @@ -35,8 +35,8 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for gitlab", - "fr": "Choisissez un chemin pour gitlab" + "en": "Choose a path for GitLab", + "fr": "Choisissez un chemin pour GitLab" }, "example": "/gitlab", "default": "/gitlab" @@ -63,8 +63,8 @@ "name": "use_web_account", "type": "boolean", "ask": { - "en": "Allow account creation via the gitlab web interface?", - "fr": "Autoriser la création de compte via l'interface web de gitlab ?" + "en": "Authorize account creation from GitLab web interface", + "fr": "Autoriser la création de compte depuis l'interface web de GitLab ?" }, "default": false } From 4d48afe7f7413b2a90b1d50a9c7e7785a1a7e9aa Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 12 Oct 2020 11:40:29 +0200 Subject: [PATCH 2/3] 13.4.3 --- README.md | 2 +- README_fr.md | 2 +- conf/gitlab.rb | 1 + manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fc1f0b0..7c756e9 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,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:** 13.4.0 +**Shipped version:** 13.4.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 15c0257..48bfc31 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour GitLab est un gestionnaire Web de dépôt Git fournissant des fonctionnalités de wiki, de rapports de bugs et de pipeline CI/CD. GitLab est une application open source développée par GitLab Inc. -**Version incluse :** 13.4.0 +**Version incluse :** 13.4.3 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 09bc780..cebc64c 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -160,6 +160,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['pages_domain_verification_cron_worker'] = "*/15 * * * *" # gitlab_rails['pages_domain_ssl_renewal_cron_worker'] = "*/10 * * * *" # gitlab_rails['pages_domain_removal_cron_worker'] = "47 0 * * *" +# gitlab_rails['remove_unaccepted_member_invites_cron_worker'] = "10 15 * * *" # gitlab_rails['schedule_migrate_external_diffs_worker_cron'] = "15 * * * *" # gitlab_rails['ci_platform_metrics_update_cron_worker'] = '47 9 * * *' # gitlab_rails['analytics_instance_statistics_count_job_trigger_worker_cron'] = "50 23 */1 * *" diff --git a/manifest.json b/manifest.json index 4a4e46b..ad48bc3 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.4.0~ynh1", + "version": "13.4.3~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 43645d2..b291b0f 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,12 +1,12 @@ #!/bin/bash -gitlab_version="13.4.0" +gitlab_version="13.4.3" # sha256sum found here: https://packages.gitlab.com/gitlab -gitlab_x86_64_buster_source_sha256="029f60fc028033493e2f1027802ad5cd978e09707107f44abe5bd15170bd6a92" +gitlab_x86_64_buster_source_sha256="48eea5c92611f695eeacaea6c5cc3f0120465d02f26d03873512fcea7b5f6860" -gitlab_arm_buster_source_sha256="592d8346af106d7c274189872a8ee46c7225c9f6b8a731990715264e9edb776a" +gitlab_arm_buster_source_sha256="b8fd6c7b62872f97c4f943aa085ce8d6f952c5dbdadc0f2e90a11f44d6e3b4a0" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From a8dde1600e92c9dcb709f02f879eb80ac8ba7626 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 12 Oct 2020 19:50:47 +0200 Subject: [PATCH 3/3] fix package_check --- conf/arm.src.default | 2 +- conf/x86-64.src.default | 2 +- scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 1 + scripts/upgrade.d/upgrade.last.sh | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/arm.src.default b/conf/arm.src.default index 2c535be..f6fd120 100644 --- a/conf/arm.src.default +++ b/conf/arm.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/buster/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/conf/x86-64.src.default b/conf/x86-64.src.default index cf7aba5..b33624e 100644 --- a/conf/x86-64.src.default +++ b/conf/x86-64.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/buster/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/scripts/install b/scripts/install index f8da9a8..fcf86b9 100644 --- a/scripts/install +++ b/scripts/install @@ -183,6 +183,7 @@ source ./upgrade.d/upgrade.last.sh cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" +ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/restore b/scripts/restore index bdbfbdd..235d58e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -103,6 +103,7 @@ mkdir -p ../conf/ cp ../settings/conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" +ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/upgrade b/scripts/upgrade index 53fc901..39cb226 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -269,6 +269,7 @@ then cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index b291b0f..31feb59 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -3,6 +3,7 @@ gitlab_version="13.4.3" # sha256sum found here: https://packages.gitlab.com/gitlab +gitlab_debian_version="buster" gitlab_x86_64_buster_source_sha256="48eea5c92611f695eeacaea6c5cc3f0120465d02f26d03873512fcea7b5f6860"