mirror of
https://github.com/YunoHost-Apps/gitlab_ynh.git
synced 2024-09-03 18:36:35 +02:00
Merge branch 'master' into testing
This commit is contained in:
commit
32dca96b10
6 changed files with 10 additions and 10 deletions
|
@ -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.
|
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.2
|
**Shipped version:** 1.6.3
|
||||||
|
|
||||||
## Screenshots
|
## Screenshots
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
setup_private=1
|
setup_private=1
|
||||||
setup_public=1
|
setup_public=1
|
||||||
upgrade=1
|
upgrade=1
|
||||||
upgrade=1 from_commit=695e9972d8e71d3e391629547b580481a56c45c1
|
upgrade=1 from_commit=e4f6f32b47718284283fbd6f7f928f921e81d871
|
||||||
backup_restore=1
|
backup_restore=1
|
||||||
multi_instance=0
|
multi_instance=0
|
||||||
incorrect_path=1
|
incorrect_path=1
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"name": "Gitlab",
|
"name": "Gitlab",
|
||||||
"id": "gitlab",
|
"id": "gitlab",
|
||||||
"packaging_format": 1,
|
"packaging_format": 1,
|
||||||
"version": "1.6.0~ynh1",
|
"version": "1.6.3~ynh1",
|
||||||
"description": {
|
"description": {
|
||||||
"en": "Gitlab for Yunohost.",
|
"en": "Gitlab for Yunohost.",
|
||||||
"fr": "Gitlab pour YunoHost."
|
"fr": "Gitlab pour YunoHost."
|
||||||
|
|
|
@ -125,7 +125,7 @@ then
|
||||||
inc=0
|
inc=0
|
||||||
|
|
||||||
# Have to wait the time that gitlab reload
|
# Have to wait the time that gitlab reload
|
||||||
while [ $status_code == "502" ] || [ $inc > 10 ]
|
while [ $status_code == "502" ] && [ $inc -lt 10 ]
|
||||||
do
|
do
|
||||||
sleep 10;
|
sleep 10;
|
||||||
status_code=$(curl -s -o /dev/null -w '%{http_code}' "$domain${path_url%/}")
|
status_code=$(curl -s -o /dev/null -w '%{http_code}' "$domain${path_url%/}")
|
||||||
|
|
|
@ -103,8 +103,8 @@ then
|
||||||
inc=0
|
inc=0
|
||||||
|
|
||||||
# Have to wait the time that gitlab reload
|
# Have to wait the time that gitlab reload
|
||||||
while [ $status_code == "502" ] || [ $inc > 10 ]
|
while [ $status_code == "502" ] && [ $inc -lt 10 ]
|
||||||
do
|
do
|
||||||
sleep 10;
|
sleep 10;
|
||||||
status_code=$(curl -s -o /dev/null -w '%{http_code}' "$domain${path_url%/}")
|
status_code=$(curl -s -o /dev/null -w '%{http_code}' "$domain${path_url%/}")
|
||||||
((inc++))
|
((inc++))
|
||||||
|
|
|
@ -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"
|
||||||
|
|
Loading…
Reference in a new issue