diff --git a/README.md b/README.md index c134f37..c61ba48 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.5.0 +**Shipped version:** 12.5.2 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 5a34fff..b18ed0e 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1691,6 +1691,9 @@ grafana['enable'] = false # grafana['env'] = { # 'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/" # } +# grafana['metrics_enabled'] = false +# grafana['metrics_basic_auth_username'] = 'grafana_metrics' # default: nil +# grafana['metrics_basic_auth_password'] = 'please_set_a_unique_password' # default: nil ### Dashboards # diff --git a/manifest.json b/manifest.json index 53311fe..702dcf6 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.5.0~ynh1", + "version": "12.5.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 f17d730..43aa73b 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.5.0" +gitlab_version="12.5.2" -gitlab_x86_64_source_sha256="b986d2214b11f6775b16360f6473ae06ad589ef4f7e1769a3f401032369db8b8" +gitlab_x86_64_source_sha256="fdf50eb4d2645ff00a8062d5af113bc778e32d9c8a6f1c442a9e52cd68d4a577" -gitlab_arm_source_sha256="e38bd488ee7ea2e9eebd5e7f6d2b804d7a5f1f4390c772afda585d015273e422" +gitlab_arm_source_sha256="7c9262ae07bf2539ea128253545220cd3b41b34a508a88eb731457d2a4f454f0" gitlab_filename="gitlab-ce-${gitlab_version}.deb"