From f29dfffc550794c5a9510abd2b429fbc09c51c13 Mon Sep 17 00:00:00 2001
From: Bourre Pierre <pierre.bourre@inria.fr>
Date: Tue, 8 Jan 2019 14:52:34 +0100
Subject: [PATCH 1/3] Wait if error 502 during CI

---
 scripts/change_url | 11 ++++++++++-
 scripts/upgrade    | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index 329007f..aef2702 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -121,5 +121,14 @@ systemctl reload nginx
 #Fix for the CI
 if sudo grep -qa container=lxc /proc/1/environ;
 then
-	sleep 60;
+	status_code=$(curl -s -o /dev/null -w '%{http_code}' "$domain${path_url%/}")
+	inc=0
+
+	# Have to wait the time that gitlab reload
+	while [ $status_code == "502" ] && [ $inc -lt 10 ]
+	do
+		sleep 10;
+		status_code=$(curl -s -o /dev/null -w '%{http_code}' "$domain${path_url%/}")
+		((inc++))
+	done;
 fi;
\ No newline at end of file
diff --git a/scripts/upgrade b/scripts/upgrade
index 6480e91..8c36837 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -99,5 +99,14 @@ systemctl reload nginx
 #Fix for the CI
 if sudo grep -qa container=lxc /proc/1/environ;
 then
-	sleep 60;
+	status_code=$(curl -s -o /dev/null -w '%{http_code}' "$domain${path_url%/}")
+	inc=0
+
+	# Have to wait the time that gitlab reload
+	while [ $status_code == "502" ] && [ $inc < 10 ]
+	do
+		sleep 10;
+		status_code=$(curl -s -o /dev/null -w '%{http_code}' "$domain${path_url%/}")
+		((inc++))
+	done;
 fi;
\ No newline at end of file

From f6934d3e4ab236ae0a4dea777e119eaeb27cc094 Mon Sep 17 00:00:00 2001
From: Bourre Pierre <pierre.bourre@inria.fr>
Date: Tue, 8 Jan 2019 14:56:51 +0100
Subject: [PATCH 2/3] Upgrade to 11.6.3

---
 README.md                    | 2 +-
 check_process                | 2 +-
 manifest.json                | 2 +-
 scripts/upgrade.d/upgrade.sh | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index bf921c8..a196b39 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:** 1.6.O
+**Shipped version:** 1.6.3
 
 ## Screenshots
 
diff --git a/check_process b/check_process
index f8fb98c..66c602a 100644
--- a/check_process
+++ b/check_process
@@ -16,7 +16,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1		from_commit=695e9972d8e71d3e391629547b580481a56c45c1
+		upgrade=1		from_commit=e4f6f32b47718284283fbd6f7f928f921e81d871
 		backup_restore=1
 		multi_instance=0
 		incorrect_path=1
diff --git a/manifest.json b/manifest.json
index 5a8da2f..bde4c20 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name": "Gitlab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "1.6.0~ynh1",
+    "version": "1.6.3~ynh1",
     "description": {
         "en": "Gitlab for Yunohost.",
         "fr": "Gitlab pour YunoHost."
diff --git a/scripts/upgrade.d/upgrade.sh b/scripts/upgrade.d/upgrade.sh
index 8404a44..d809e94 100644
--- a/scripts/upgrade.d/upgrade.sh
+++ b/scripts/upgrade.d/upgrade.sh
@@ -1,5 +1,5 @@
-gitlab_version="11.6.2"
+gitlab_version="11.6.3"
 
-gitlab_x86_64_source_sha256="4a0efa976579c91d8f34d8c91b44bf7d4e76957552ecc603fea72f88043d54fc"
+gitlab_x86_64_source_sha256="5a990a76c1656ddd42673562d8bd1be106a835331a2ce976d405c536a5567485"
 
-gitlab_arm_source_sha256="8e892bb387c481736aeb61570d23cfa902c63a0deafc0af5618ec7a9aec71c84"
+gitlab_arm_source_sha256="3b1d1c650df8722d0b63b5db3e6c2440ea70224deeca0621a9c5226a06079d2e"

From 343224ac77e9573395f467d89ed41ba10f873075 Mon Sep 17 00:00:00 2001
From: bourreP <pierre.moltess@gmail.com>
Date: Thu, 10 Jan 2019 14:10:30 +0100
Subject: [PATCH 3/3] Update upgrade

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8c36837..045e126 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -103,10 +103,10 @@ then
 	inc=0
 
 	# Have to wait the time that gitlab reload
-	while [ $status_code == "502" ] && [ $inc < 10 ]
+	while [ $status_code == "502" ] && [ $inc -lt 10 ]
 	do
 		sleep 10;
 		status_code=$(curl -s -o /dev/null -w '%{http_code}' "$domain${path_url%/}")
 		((inc++))
 	done;
-fi;
\ No newline at end of file
+fi;