diff --git a/README.md b/README.md index 4235bae..912048e 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.3.1 +**Shipped version:** 12.3.2 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index eb0d1fd..2d86a11 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -71,6 +71,9 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['gitlab_email_display_name'] = 'Example' # gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com' # gitlab_rails['gitlab_email_subject_suffix'] = '' +# gitlab_rails['gitlab_email_smime_enabled'] = false +# gitlab_rails['gitlab_email_smime_key_file'] = '/etc/gitlab/ssl/gitlab_smime.key' +# gitlab_rails['gitlab_email_smime_cert_file'] = '/etc/gitlab/ssl/gitlab_smime.crt' ### GitLab user privileges # gitlab_rails['gitlab_default_can_create_group'] = true @@ -498,6 +501,8 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['db_sslmode'] = nil # gitlab_rails['db_sslcompression'] = 0 # gitlab_rails['db_sslrootcert'] = nil +# gitlab_rails['db_sslcert'] = nil +# gitlab_rails['db_sslkey'] = nil # gitlab_rails['db_prepared_statements'] = false # gitlab_rails['db_statements_limit'] = 1000 diff --git a/manifest.json b/manifest.json index b508a0e..cb5e8d4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.3.1~ynh1", + "version": "12.3.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 fb2e404..853a1c8 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.3.1" +gitlab_version="12.3.2" -gitlab_x86_64_source_sha256="e00c66eda3f9f0a6580c29c1b1d0825472a1f8240335d664337dde13ac6f479d" +gitlab_x86_64_source_sha256="4797306a282b46734533c53b7af79e0043b0a19e003e3461433c2a82ec34f0e3" -gitlab_arm_source_sha256="c26cf58ae0ec97f55f471c3ebaad9a194b906fa8abae8dfca13df1bb103c5328" +gitlab_arm_source_sha256="65a0ff5e681bb2078ea6dfe8032aad88317997a6058dc5243c17060839f82151" gitlab_filename="gitlab-ce-${gitlab_version}.deb"