Merge pull request #60 from YunoHost-Apps/testing

Upgrade to 11.11.1

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:** 11.11.0
+**Shipped version:** 11.11.1
 
 ## Screenshots
 

manifest.json

@@ -2,7 +2,7 @@
     "name": "Gitlab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "11.11.0~ynh1",
+    "version": "11.11.1~ynh1",
     "description": {
         "en": "GitLab is a Git-repository manager.",
         "fr": "GitLab est un gestionnaire de dépôts Git."

pull_request_template.md

@@ -13,9 +13,9 @@
 
 ## Validation
 ---
-- [ ] **Code review**
+- [ ] **Code review** : 
-- [ ] **Approval (LGTM)**  
+- [ ] **Approval (LGTM)** :  
-*Code review and approval have to be from a member of @YunoHost/apps group*
+*Code review and approval have to be from a member of @YunoHost-Apps/apps-group*
 - **CI succeeded** : 
 [![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/gitlab_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/gitlab_ynh%20PR-NUM-/)  
 *Please replace '-NUM-' in this link by the PR number.*  

scripts/backup

@@ -47,11 +47,9 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_script_progression --message="Backuping of Gitlab..." --weight=9
 
 # Use gitlab-rake to backup
-gitlab-rake gitlab:backup:create > backup.log
+# For the complete doc: https://docs.gitlab.com/ce/raketasks/backup_restore.html
-
+# For the filename: https://docs.gitlab.com/ce/raketasks/backup_restore.html#backup-filename
-# Searching in backup logs the name of the backup archive created
+gitlab-rake gitlab:backup:create BACKUP=last
-last_backup=$(grep _gitlab_backup.tar backup.log | cut -d' ' -f4)
-mv "/var/opt/$app/backups/$last_backup" "/var/opt/$app/backups/last_gitlab_backup.tar"
 
 ynh_backup --src_path="/var/opt/$app/backups/last_gitlab_backup.tar"
 

scripts/restore

@@ -140,10 +140,9 @@ gitlab-ctl stop unicorn
 gitlab-ctl stop sidekiq
 
 # Use gitlab-rake to backup
+# Doc: https://docs.gitlab.com/ce/raketasks/backup_restore.html#restore-for-omnibus-gitlab-installations
 ynh_exec_warn_less gitlab-rake gitlab:backup:restore force=yes BACKUP=$last_backup
 
-gitlab-rake gitlab:check SANITIZE=true
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
@@ -159,6 +158,12 @@ ynh_script_progression --message="Waiting for gitlab..." --weight=14
 
 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600
 
+#=================================================
+# CHECK THE RESTORED DATA
+#=================================================
+
+gitlab-rake gitlab:check SANITIZE=true
+
 #=================================================
 # RELOAD NGINX
 #=================================================

scripts/upgrade.d/upgrade.last.sh

@@ -1,7 +1,7 @@
-gitlab_version="11.11.0"
+gitlab_version="11.11.1"
 
-gitlab_x86_64_source_sha256="e15df41f1a9d40d23a710352ce1a77b30ebdd075dbc92430aa49dd6c3107f5c6"
+gitlab_x86_64_source_sha256="b23af7ec2689e6eff69927e1176e8b009ed01b6b66df4ff80e9ab5da67e0684d"
 
-gitlab_arm_source_sha256="03ce2b720e7266fb5ea6e00b3dc4f71b0c886c336db0669422ec332fe4df4447"
+gitlab_arm_source_sha256="4847ae487dcbcb26cf60842cd016b66ccccc5a1e71778582d333010aa0daf7cf"
 
 gitlab_filename="gitlab-ce-${gitlab_version}.deb"