From 7fb106d35a09ab6cf064197a08f09a429248b1f5 Mon Sep 17 00:00:00 2001
From: kay0u <pierre.moltess@gmail.com>
Date: Wed, 19 Jun 2019 19:05:08 +0200
Subject: [PATCH 01/13] change timeout and restart gitlab service

---
 scripts/change_url | 2 +-
 scripts/install    | 7 +++++++
 scripts/restore    | 2 +-
 scripts/upgrade    | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index c27647c..b30f1e3 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -124,7 +124,7 @@ gitlab-ctl reconfigure
 #=================================================
 ynh_script_progression --message="Waiting for gitlab..." --weight=15
 
-ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600
+ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
 
 #=================================================
 # GENERIC FINALISATION
diff --git a/scripts/install b/scripts/install
index 581c163..d61c717 100644
--- a/scripts/install
+++ b/scripts/install
@@ -249,6 +249,13 @@ ynh_script_progression --message="Reloading nginx web server..." --weight=1
 
 ynh_systemd_action --action=reload --service_name=nginx
 
+#=================================================
+# RESTART GITLAB
+#=================================================
+ynh_script_progression --message="Restarting gitlab..." --weight=15
+
+ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
+
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index d2f1aa9..1b9c9ca 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -156,7 +156,7 @@ yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/applica
 #=================================================
 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
+ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
 
 #=================================================
 # CHECK THE RESTORED DATA
diff --git a/scripts/upgrade b/scripts/upgrade
index 490e11a..545f478 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -303,7 +303,7 @@ then
 	ynh_script_progression --message="Waiting for gitlab..." --weight=15
 
 	# Action status to just wait the service
-	ynh_systemd_action --action=status --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600
+	ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
 fi
 
 #=================================================

From dd4341954cd9d07894811ff6523dd79b30606a22 Mon Sep 17 00:00:00 2001
From: Kayou <pierre.moltess@gmail.com>
Date: Wed, 19 Jun 2019 20:05:52 +0200
Subject: [PATCH 02/13] Remove comment

---
 scripts/upgrade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 545f478..c09442e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -302,7 +302,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Waiting for gitlab..." --weight=15
 
-	# Action status to just wait the service
 	ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
 fi
 

From 6d9f1de378190c1c9c3dcc348f135f54b24fd9ec Mon Sep 17 00:00:00 2001
From: Kayou <pierre.moltess@gmail.com>
Date: Fri, 21 Jun 2019 09:30:32 +0200
Subject: [PATCH 03/13] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index c09442e..2f1e300 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -300,7 +300,7 @@ fi
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Waiting for gitlab..." --weight=15
+	ynh_script_progression --message="Restarting gitlab..." --weight=15
 
 	ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300
 fi

From 17b992442968c4c07357525d4234b4d1873c7587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= <pierre.moltess@gmail.com>
Date: Sun, 23 Jun 2019 14:11:52 +0200
Subject: [PATCH 04/13] Update Gitlab to 12.0.0

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

diff --git a/README.md b/README.md
index 8e6806f..69eb31f 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:** 11.11.1
+**Shipped version:** 12.0.0
 
 ## Screenshots
 
diff --git a/manifest.json b/manifest.json
index 20e71b6..1358683 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name": "Gitlab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "11.11.1~ynh1",
+    "version": "12.0.0~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 a69604b..cebc574 100644
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,7 +1,7 @@
-gitlab_version="11.11.1"
+gitlab_version="12.0.0"
 
-gitlab_x86_64_source_sha256="b23af7ec2689e6eff69927e1176e8b009ed01b6b66df4ff80e9ab5da67e0684d"
+gitlab_x86_64_source_sha256="b32070d2a4c83c914b9fd07713501e3c99e31a288de64a7794a6de2c2b6f7494"
 
-gitlab_arm_source_sha256="4847ae487dcbcb26cf60842cd016b66ccccc5a1e71778582d333010aa0daf7cf"
+gitlab_arm_source_sha256="cd3f0ffd16d1d80184e79b552ae5cc3bb33012d1d51bb9c5cb48d461f5c70b07"
 
 gitlab_filename="gitlab-ce-${gitlab_version}.deb"

From fba5659944a397934c626e4ffe94ffdc9bdf0737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= <pierre.moltess@gmail.com>
Date: Sun, 23 Jun 2019 14:39:42 +0200
Subject: [PATCH 05/13] Update gitlab.rb

---
 conf/gitlab.rb | 84 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 63 insertions(+), 21 deletions(-)

diff --git a/conf/gitlab.rb b/conf/gitlab.rb
index 09183ae..2ed799f 100644
--- a/conf/gitlab.rb
+++ b/conf/gitlab.rb
@@ -115,6 +115,7 @@ external_url '__GENERATED_EXTERNAL_URL__'
 # gitlab_rails['admin_email_worker_cron'] = "0 0 * * 0"
 # gitlab_rails['repository_archive_cache_worker_cron'] = "0 * * * *"
 # gitlab_rails['pages_domain_verification_cron_worker'] = "*/15 * * * *"
+# gitlab_rails['pages_domain_removal_cron_worker'] = "47 0 * * *"
 # gitlab_rails['schedule_migrate_external_diffs_worker_cron'] = "15 * * * *"
 
 ### Webhook Settings
@@ -432,6 +433,11 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__
 # gitlab_rails['initial_root_password'] = "password"
 # gitlab_rails['initial_shared_runners_registration_token'] = "token"
 
+#### Set path to an initial license to be used while bootstrapping GitLab.
+####! **Only applicable on initial setup, future license updations need to be done via UI.
+####! Updating the file specified in this path won't yield any change after the first reconfigure run.
+# gitlab_rails['iniitial_license_file'] = '/etc/gitlab/company.gitlab-license'
+
 #### Enable or disable automatic database migrations
 # gitlab_rails['auto_migrate'] = true
 
@@ -585,7 +591,13 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__
 # registry['default_notifications_backoff'] = "1s"
 # registry['default_notifications_headers'] = {}
 
-
+################################################################################
+## Error Reporting and Logging with Sentry
+################################################################################
+# gitlab_rails['sentry_enabled'] = false
+# gitlab_rails['sentry_dsn'] = 'https://<key>@sentry.io/<project>'
+# gitlab_rails['sentry_clientside_dsn'] = 'https://<key>@sentry.io/<project>'
+# gitlab_rails['sentry_environment'] = 'production'
 
 ################################################################################
 ## GitLab Workhorse
@@ -717,7 +729,7 @@ unicorn['port'] = __UNICORN_PORT__
 ################################################################################
 
 # sidekiq['log_directory'] = "/var/log/gitlab/sidekiq"
-# sidekiq['log_format'] = "default"
+# sidekiq['log_format'] = "json"
 # sidekiq['shutdown_timeout'] = 4
 sidekiq['concurrency'] = 5
 # sidekiq['metrics_enabled'] = true
@@ -994,7 +1006,7 @@ nginx['client_max_body_size'] = '__CLIENT_MAX_BODY_SIZE__'
 
 ##! **Recommended by: https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
 ##!                   https://cipherli.st/**
-# nginx['ssl_protocols'] = "TLSv1.1 TLSv1.2"
+# nginx['ssl_protocols'] = "TLSv1.2"
 
 ##! **Recommended in: https://nginx.org/en/docs/http/ngx_http_ssl_module.html**
 # nginx['ssl_session_cache'] = "builtin:1000  shared:SSL:10m"
@@ -1184,6 +1196,9 @@ nginx['listen_https'] = false
 ##! Configure to expose GitLab Pages on external IP address, serving the HTTPS
 # gitlab_pages['external_https'] = []
 
+##! Configure to use the default list of cipher suites
+# gitlab_pages['insecure_ciphers'] = false
+
 ##! Configure to enable health check endpoint on GitLab Pages
 # gitlab_pages['status_uri'] = "/@status"
 
@@ -1200,6 +1215,9 @@ nginx['listen_https'] = false
 ##! Listen for requests forwarded by reverse proxy
 # gitlab_pages['listen_proxy'] = "localhost:8090"
 
+##! Configure GitLab Pages to use an HTTP Proxy
+# gitlab_pages['http_proxy'] = "http://example:8080"
+
 # gitlab_pages['redirect_http'] = true
 # gitlab_pages['use_http2'] = true
 # gitlab_pages['dir'] = "/var/opt/gitlab/gitlab-pages"
@@ -1216,6 +1234,12 @@ nginx['listen_https'] = false
 ##! Prometheus metrics for Pages docs: https://gitlab.com/gitlab-org/gitlab-pages/#enable-prometheus-metrics
 # gitlab_pages['metrics_address'] = ":9235"
 
+##! Specifies the minimum SSL/TLS version ("ssl3", "tls1.0", "tls1.1" or "tls1.2")
+# gitlab_pages['tls_min_version'] = "ssl3"
+
+##! Specifies the maximum SSL/TLS version ("ssl3", "tls1.0", "tls1.1" or "tls1.2")
+# gitlab_pages['tls_max_version'] = "tls1.2"
+
 ##! Configure the pages admin API
 # gitlab_pages['admin_secret_token'] = 'custom secret'
 # gitlab_pages['admin_https_listener'] = '0.0.0.0:5678'
@@ -1231,7 +1255,7 @@ nginx['listen_https'] = false
 # gitlab_pages['gitlab_id'] = nil # Automatically generated if not present
 # gitlab_pages['gitlab_secret'] = nil # Generated if not present
 # gitlab_pages['auth_redirect_uri'] = nil # Defaults to projects subdomain of pages_external_url and + '/auth'
-# gitlab_pages['auth_server'] = nil # Defaults to external_url
+# gitlab_pages['gitlab_server'] = nil # Defaults to external_url
 # gitlab_pages['auth_secret'] = nil # Generated if not present
 
 ################################################################################
@@ -1359,7 +1383,6 @@ nginx['listen_https'] = false
 # prometheus['rules_files'] = ['/var/opt/gitlab/prometheus/rules/*.rules']
 # prometheus['scrape_interval'] = 15
 # prometheus['scrape_timeout'] = 15
-# prometheus['chunk_encoding_version'] = 2
 # prometheus['env_directory'] = '/opt/gitlab/etc/prometheus/env'
 # prometheus['env'] = {
 #   'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/"
@@ -1401,23 +1424,10 @@ nginx['listen_https'] = false
 #   }
 # ]
 #
-### Prometheus Memory Management
-#
-# Prometheus needs to be configured for how much memory is used.
-# * This sets the target heap size.
-# * This value accounts for approximately 2/3 of the memory used by the server.
-# * The recommended memory is 4kb per unique metrics time-series.
-# See: https://prometheus.io/docs/operating/storage/#memory-usage
-#
-# prometheus['target_heap_size'] = (
-#   # Use 25mb + 2% of total memory for Prometheus memory.
-#   26_214_400 + (node['memory']['total'].to_i * 1024 * 0.02 )
-# ).to_i
+### Custom Prometheus flags
 #
 # prometheus['flags'] = {
 #   'storage.local.path' => "#{node['gitlab']['prometheus']['home']}/data",
-#   'storage.local.chunk-encoding-version' => user_config['chunk-encoding-version'],
-#   'storage.local.target-heap-size' => node['gitlab']['prometheus']['target-heap-size'],
 #   'config.file' => "#{node['gitlab']['prometheus']['home']}/prometheus.yml"
 # }
 
@@ -1426,7 +1436,6 @@ nginx['listen_https'] = false
 
 ################################################################################
 ## Prometheus Alertmanager
-##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/alertmanager.html
 ################################################################################
 
 # alertmanager['enable'] = true
@@ -1537,7 +1546,7 @@ nginx['listen_https'] = false
 ##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/#prometheus-as-a-grafana-data-source
 ################################################################################
 
-# grafana['enable'] = false
+# grafana['enable'] = true
 # grafana['log_directory'] = '/var/log/gitlab/grafana'
 # grafana['home'] = '/var/opt/gitlab/grafana'
 # grafana['admin_password'] = 'admin'
@@ -1616,10 +1625,12 @@ nginx['listen_https'] = false
 # gitaly['logging_format'] = "json"
 # gitaly['logging_sentry_dsn'] = "https://<key>:<secret>@sentry.io/<project>"
 # gitaly['logging_ruby_sentry_dsn'] = "https://<key>:<secret>@sentry.io/<project>"
+# gitaly['logging_sentry_environment'] = "production"
 # gitaly['prometheus_grpc_latency_buckets'] = "[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]"
 # gitaly['auth_token'] = '<secret>'
 # gitaly['auth_transitioning'] = false # When true, auth is logged to Prometheus but NOT enforced
 # gitaly['graceful_restart_timeout'] = '1m' # Grace time for a gitaly process to finish ongoing requests
+# gitaly['git_catfile_cache_size'] = 100 # Number of 'git cat-file' processes kept around for re-use
 # gitaly['ruby_max_rss'] = 300000000 # RSS threshold in bytes for triggering a gitaly-ruby restart
 # gitaly['ruby_graceful_restart_timeout'] = '10m' # Grace time for a gitaly-ruby process to finish ongoing requests
 # gitaly['ruby_restart_delay'] = '5m' # Period of sustained high RSS that needs to be observed before restarting gitaly-ruby
@@ -1728,6 +1739,30 @@ nginx['listen_https'] = false
 #   # 'path_style' => false # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
 # }
 
+################################################################################
+## Dependency proxy (EE Only)
+##! Docs: https://docs.gitlab.com/ee/administration/dependency_proxy.md
+################################################################################
+
+# gitlab_rails['dependency_proxy_enabled'] = true
+# gitlab_rails['dependency_proxy_storage_path'] = "/var/opt/gitlab/gitlab-rails/shared/dependency_proxy"
+# gitlab_rails['dependency_proxy_object_store_enabled'] = false
+# gitlab_rails['dependency_proxy_object_store_direct_upload'] = false
+# gitlab_rails['dependency_proxy_object_store_background_upload'] = true
+# gitlab_rails['dependency_proxy_object_store_proxy_download'] = false
+# gitlab_rails['dependency_proxy_object_store_remote_directory'] = "dependency_proxy"
+# gitlab_rails['dependency_proxy_object_store_connection'] = {
+#   'provider' => 'AWS',
+#   'region' => 'eu-west-1',
+#   'aws_access_key_id' => 'AWS_ACCESS_KEY_ID',
+#   'aws_secret_access_key' => 'AWS_SECRET_ACCESS_KEY',
+#   # # The below options configure an S3 compatible host instead of AWS
+#   # 'host' => 's3.amazonaws.com',
+#   # 'aws_signature_version' => 4, # For creation of signed URLs. Set to 2 if provider does not support v4.
+#   # 'endpoint' => 'https://s3.amazonaws.com', # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces
+#   # 'path_style' => false # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
+# }
+
 ################################################################################
 ## GitLab Sentinel (EE Only)
 ##! Docs: http://docs.gitlab.com/ce/administration/high_availability/redis.html#high-availability-with-sentinel
@@ -1838,6 +1873,13 @@ nginx['listen_https'] = false
 # geo_primary_role['enable'] = false
 # geo_secondary_role['enable'] = false
 
+# This is an optional identifier which Geo nodes can use to identify themselves.
+# For example, if external_url is the same for two secondaries, you must specify
+# a unique Geo node name for those secondaries.
+#
+# If it is blank, it defaults to external_url.
+# gitlab_rails['geo_node_name'] = nil
+
 ################################################################################
 ## GitLab Geo Secondary (EE only)
 ################################################################################

From be149819aa174b683e91997a1eaa14f7faaae060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= <pierre.moltess@gmail.com>
Date: Sun, 23 Jun 2019 16:33:48 +0200
Subject: [PATCH 06/13] Fix package_check

---
 scripts/install | 2 +-
 scripts/restore | 2 +-
 scripts/upgrade | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 581c163..82a4a2d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -184,7 +184,7 @@ ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ; 
 	then # This command will fail in lxc env
-		ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf  | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
+		ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
 		ynh_exec_warn_less dpkg --configure gitlab-ce
 	fi
 else
diff --git a/scripts/restore b/scripts/restore
index d2f1aa9..f5188bf 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -118,7 +118,7 @@ ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
 	then # This command will fail in lxc env
-		ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf  | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
+		ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
 		ynh_exec_warn_less dpkg --configure gitlab-ce
 	fi
 else
diff --git a/scripts/upgrade b/scripts/upgrade
index 490e11a..0a2d52f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -254,7 +254,7 @@ then
 	if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 		if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
 		then # This command will fail in lxc env
-			ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf  | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
+			ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
 			ynh_exec_warn_less dpkg --configure gitlab-ce
 		fi
 	else

From 265ff70779654547582ac2368d632edec117f9a5 Mon Sep 17 00:00:00 2001
From: kay0u <pierre.moltess@gmail.com>
Date: Thu, 27 Jun 2019 12:09:48 +0200
Subject: [PATCH 07/13] 12.0.2

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

diff --git a/README.md b/README.md
index 69eb31f..63deac1 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.0.0
+**Shipped version:** 12.0.2
 
 ## Screenshots
 
diff --git a/manifest.json b/manifest.json
index 1358683..864c2bc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name": "Gitlab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "12.0.0~ynh1",
+    "version": "12.0.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 cebc574..7a01dbb 100644
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,7 +1,7 @@
-gitlab_version="12.0.0"
+gitlab_version="12.0.2"
 
-gitlab_x86_64_source_sha256="b32070d2a4c83c914b9fd07713501e3c99e31a288de64a7794a6de2c2b6f7494"
+gitlab_x86_64_source_sha256="8c528a01ceca69ba566161b3d06a1f5315f76b3468f7b2c411bf830fcc486099"
 
-gitlab_arm_source_sha256="cd3f0ffd16d1d80184e79b552ae5cc3bb33012d1d51bb9c5cb48d461f5c70b07"
+gitlab_arm_source_sha256="6953194c3939b606831399c6728dc168b5e82faf9db088f976f515900d534b74"
 
 gitlab_filename="gitlab-ce-${gitlab_version}.deb"

From e6650ca7120d4cb5e8a6095740880304fd4577f1 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre.moltess@gmail.com>
Date: Wed, 3 Jul 2019 20:17:04 +0200
Subject: [PATCH 08/13] 12.0.3

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

diff --git a/README.md b/README.md
index 63deac1..a821572 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.0.2
+**Shipped version:** 12.0.3
 
 ## Screenshots
 
diff --git a/manifest.json b/manifest.json
index 864c2bc..b7a6ead 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name": "Gitlab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "12.0.2~ynh1",
+    "version": "12.0.3~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 7a01dbb..d491958 100644
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,7 +1,7 @@
-gitlab_version="12.0.2"
+gitlab_version="12.0.3"
 
-gitlab_x86_64_source_sha256="8c528a01ceca69ba566161b3d06a1f5315f76b3468f7b2c411bf830fcc486099"
+gitlab_x86_64_source_sha256="9e2dcb0e4e3ca3c230d43c6b8580d77c2c716f3c6d1055739f175ead20d83678"
 
-gitlab_arm_source_sha256="6953194c3939b606831399c6728dc168b5e82faf9db088f976f515900d534b74"
+gitlab_arm_source_sha256="992710fd2c4076961f03633cb6b56331f7ade63a6869c47c2ce28995f8b43893"
 
 gitlab_filename="gitlab-ce-${gitlab_version}.deb"

From 8a48ebf2c51487baaa68f929838c0d0f620a2d34 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre.moltess@gmail.com>
Date: Thu, 4 Jul 2019 00:24:20 +0200
Subject: [PATCH 09/13] Migration from 11.x to 12.x

---
 scripts/upgrade                      | 62 +++++++++++++++++++---------
 scripts/upgrade.d/upgrade.11.10.1.sh |  7 ----
 scripts/upgrade.d/upgrade.11.10.2.sh |  7 ----
 scripts/upgrade.d/upgrade.11.10.4.sh |  7 ----
 scripts/upgrade.d/upgrade.11.6.3.sh  |  5 ---
 scripts/upgrade.d/upgrade.11.7.0.sh  |  5 ---
 scripts/upgrade.d/upgrade.11.7.3.sh  |  5 ---
 scripts/upgrade.d/upgrade.11.7.4.sh  |  5 ---
 scripts/upgrade.d/upgrade.11.7.5.sh  |  5 ---
 scripts/upgrade.d/upgrade.11.8.0.sh  |  5 ---
 scripts/upgrade.d/upgrade.11.8.1.sh  |  7 ----
 scripts/upgrade.d/upgrade.11.9.0.sh  |  7 ----
 scripts/upgrade.d/upgrade.11.9.1.sh  |  7 ----
 scripts/upgrade.d/upgrade.11.9.4.sh  |  7 ----
 scripts/upgrade.d/upgrade.11.9.8.sh  |  7 ----
 scripts/upgrade.d/upgrade.11.sh      |  7 ++++
 16 files changed, 49 insertions(+), 106 deletions(-)
 delete mode 100644 scripts/upgrade.d/upgrade.11.10.1.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.10.2.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.10.4.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.6.3.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.7.0.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.7.3.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.7.4.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.7.5.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.8.0.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.8.1.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.9.0.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.9.1.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.9.4.sh
 delete mode 100644 scripts/upgrade.d/upgrade.11.9.8.sh
 create mode 100644 scripts/upgrade.d/upgrade.11.sh

diff --git a/scripts/upgrade b/scripts/upgrade
index 0a2d52f..31cf5e1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -236,32 +236,54 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Setting up source files..." --weight=200
 
+	current_version=$(grep gitlab-ce /opt/gitlab/version-manifest.txt | cut -d' ' -f2)
+
+	# Load the last available version
 	source ./upgrade.d/upgrade.last.sh
-	cp ../conf/$architecture.src.default ../conf/$architecture.src
-	ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src"
-	ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src"
+	last_version=$gitlab_version
+	last_major_version=${gitlab_version%%.*}
 
-	if [ $architecture = "x86-64" ]; then
-		ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src"
-	elif [ $architecture = "arm" ]; then
-		ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src"
-	fi
+	# While the current version is not the last version, do an upgrade
+	while [ "$last_version" != "$current_version" ]
+	do
 
-	tempdir="$(mktemp -d)"
+		current_major_version=${current_version%%.*}
 
-	ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
-
-	if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-		if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
-		then # This command will fail in lxc env
-			ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
-			ynh_exec_warn_less dpkg --configure gitlab-ce
+		# If the current version has the same major version than the next one,
+		# then it's the last upgrade to do
+		if [ "$last_major_version" -eq "$current_major_version" ]; then
+			current_major_version=last
 		fi
-	else
-		ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename
-	fi
 
-	ynh_exec_warn_less ynh_secure_remove --file="$tempdir"
+		source ./upgrade.d/upgrade.$current_major_version.sh
+		cp ../conf/$architecture.src.default ../conf/$architecture.src
+		ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src"
+		ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src"
+
+		if [ $architecture = "x86-64" ]; then
+			ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src"
+		elif [ $architecture = "arm" ]; then
+			ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src"
+		fi
+
+		tempdir="$(mktemp -d)"
+
+		ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
+
+		if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
+			if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
+			then # This command will fail in lxc env
+				ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
+				ynh_exec_warn_less dpkg --configure gitlab-ce
+			fi
+		else
+			ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename
+		fi
+
+		ynh_exec_warn_less ynh_secure_remove --file="$tempdir"
+
+		current_version=$(grep gitlab-ce /opt/gitlab/version-manifest.txt | cut -d' ' -f2)
+	done
 fi
 
 #=================================================
diff --git a/scripts/upgrade.d/upgrade.11.10.1.sh b/scripts/upgrade.d/upgrade.11.10.1.sh
deleted file mode 100644
index 366e291..0000000
--- a/scripts/upgrade.d/upgrade.11.10.1.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-gitlab_version="11.10.1"
-
-gitlab_x86_64_source_sha256="cffde1c3875c2864c3e954dd1077acde3cc87d8f8963309d2ac4455d621748eb"
-
-gitlab_arm_source_sha256="f414dbfaa074843c0f693e8d5cd63d6fd913c7a39358ebcb55f5be664aaf5916"
-
-gitlab_filename="gitlab-ce-${gitlab_version}.deb"
diff --git a/scripts/upgrade.d/upgrade.11.10.2.sh b/scripts/upgrade.d/upgrade.11.10.2.sh
deleted file mode 100644
index f004207..0000000
--- a/scripts/upgrade.d/upgrade.11.10.2.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-gitlab_version="11.10.2"
-
-gitlab_x86_64_source_sha256="40732062a4f6f70043d7cb56c647b23353c8bf7ed42cf676f77d0376237b8736"
-
-gitlab_arm_source_sha256="204d30853de173569718e045d2d7ac6fba266aa0f14e345a5ba431bfbf3daea6"
-
-gitlab_filename="gitlab-ce-${gitlab_version}.deb"
diff --git a/scripts/upgrade.d/upgrade.11.10.4.sh b/scripts/upgrade.d/upgrade.11.10.4.sh
deleted file mode 100644
index 3955ac6..0000000
--- a/scripts/upgrade.d/upgrade.11.10.4.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-gitlab_version="11.10.4"
-
-gitlab_x86_64_source_sha256="0c1875b86a819fc48aa0ba6df0d5e322d633056ec73dfd10a2973c48cbbd2f6a"
-
-gitlab_arm_source_sha256="fa551e0a01dfba22857acdc91a19e5340fc4e595085dcde07afed4bce5ea4239"
-
-gitlab_filename="gitlab-ce-${gitlab_version}.deb"
diff --git a/scripts/upgrade.d/upgrade.11.6.3.sh b/scripts/upgrade.d/upgrade.11.6.3.sh
deleted file mode 100644
index d809e94..0000000
--- a/scripts/upgrade.d/upgrade.11.6.3.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-gitlab_version="11.6.3"
-
-gitlab_x86_64_source_sha256="5a990a76c1656ddd42673562d8bd1be106a835331a2ce976d405c536a5567485"
-
-gitlab_arm_source_sha256="3b1d1c650df8722d0b63b5db3e6c2440ea70224deeca0621a9c5226a06079d2e"
diff --git a/scripts/upgrade.d/upgrade.11.7.0.sh b/scripts/upgrade.d/upgrade.11.7.0.sh
deleted file mode 100644
index 6c4706e..0000000
--- a/scripts/upgrade.d/upgrade.11.7.0.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-gitlab_version="11.7.0"
-
-gitlab_x86_64_source_sha256="5a989b1e664494e6de139064b349fe9b22f37d5edd2918a4968fdf5e818a10c4"
-
-gitlab_arm_source_sha256="558e6b3cf87bd5c8b3dee567b2557ee6cc3fb40655cc6dabe5531c94cf27b99d"
diff --git a/scripts/upgrade.d/upgrade.11.7.3.sh b/scripts/upgrade.d/upgrade.11.7.3.sh
deleted file mode 100644
index bf713c5..0000000
--- a/scripts/upgrade.d/upgrade.11.7.3.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-gitlab_version="11.7.3"
-
-gitlab_x86_64_source_sha256="9c15fbbc4de7fb22ec4d3b120bdb32d65d8d329e453a80065031fbb5bb45b7cb"
-
-gitlab_arm_source_sha256="36cd946387d2f1a262e8bb92c76e1db34be09c1a4e6983938f2e9c45813614c8"
diff --git a/scripts/upgrade.d/upgrade.11.7.4.sh b/scripts/upgrade.d/upgrade.11.7.4.sh
deleted file mode 100644
index 7e7a24d..0000000
--- a/scripts/upgrade.d/upgrade.11.7.4.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-gitlab_version="11.7.4"
-
-gitlab_x86_64_source_sha256="ac207cfc2507be9d23ed2ebdcadbf743e45832abd235b6c73ecf370f9497e6c8"
-
-gitlab_arm_source_sha256="3378b91a7707f6788929c9fe00bc16072de5c9c5546270a55b9863bec86c74d0"
diff --git a/scripts/upgrade.d/upgrade.11.7.5.sh b/scripts/upgrade.d/upgrade.11.7.5.sh
deleted file mode 100644
index 10bfefc..0000000
--- a/scripts/upgrade.d/upgrade.11.7.5.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-gitlab_version="11.7.5"
-
-gitlab_x86_64_source_sha256="bed16a7fdbbc80055ef1784221d70254eb5bda70891a61fe18f818f2f36ed0d4"
-
-gitlab_arm_source_sha256="92eed427abe3f2ccc509aed38cfee447e3e853fbe0d89620f165189e3741a9c1"
diff --git a/scripts/upgrade.d/upgrade.11.8.0.sh b/scripts/upgrade.d/upgrade.11.8.0.sh
deleted file mode 100644
index 1651adc..0000000
--- a/scripts/upgrade.d/upgrade.11.8.0.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-gitlab_version="11.8.0"
-
-gitlab_x86_64_source_sha256="fd0a5c0adac65a731eebdfbecccee8f7f6274922a32ca1a01980ae09a3fdd499"
-
-gitlab_arm_source_sha256="4633bab56c78bcf745cac342fd327085461406ab87d197461d477ce67c15f24d"
diff --git a/scripts/upgrade.d/upgrade.11.8.1.sh b/scripts/upgrade.d/upgrade.11.8.1.sh
deleted file mode 100644
index 39b0bf5..0000000
--- a/scripts/upgrade.d/upgrade.11.8.1.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-gitlab_version="11.8.1"
-
-gitlab_x86_64_source_sha256="ee670ddbad60bdd10d93749593a25a62f1d10f2b232da70b8e42081778b9a36b"
-
-gitlab_arm_source_sha256="582a5ed77ef50a16377a00f403a6b8f425e8fb98593be95fb0f7cb6db8e5629d"
-
-gitlab_filename="gitlab-ce-${gitlab_version}.deb"
diff --git a/scripts/upgrade.d/upgrade.11.9.0.sh b/scripts/upgrade.d/upgrade.11.9.0.sh
deleted file mode 100644
index efc07d1..0000000
--- a/scripts/upgrade.d/upgrade.11.9.0.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-gitlab_version="11.9.0"
-
-gitlab_x86_64_source_sha256="13dcff613c9f7a915117aec8d788e99ac4742e1ac7be0c7c6a87fc8de8f4275d"
-
-gitlab_arm_source_sha256="2aec5d04f05cc3bb2fa22e52232e4e0841e58fb3f77052f776292db09e2fcf87"
-
-gitlab_filename="gitlab-ce-${gitlab_version}.deb"
diff --git a/scripts/upgrade.d/upgrade.11.9.1.sh b/scripts/upgrade.d/upgrade.11.9.1.sh
deleted file mode 100644
index 7101850..0000000
--- a/scripts/upgrade.d/upgrade.11.9.1.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-gitlab_version="11.9.1"
-
-gitlab_x86_64_source_sha256="9668345176be07f1f8637b3c72ffea6f8fe2e76a8c5b10b74a340b9b6b97788c"
-
-gitlab_arm_source_sha256="df1fb5be8ec089a77cfe8276cbaabe0e40b0f3368cafc07de984d7795252ee21"
-
-gitlab_filename="gitlab-ce-${gitlab_version}.deb"
diff --git a/scripts/upgrade.d/upgrade.11.9.4.sh b/scripts/upgrade.d/upgrade.11.9.4.sh
deleted file mode 100644
index ec84656..0000000
--- a/scripts/upgrade.d/upgrade.11.9.4.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-gitlab_version="11.9.4"
-
-gitlab_x86_64_source_sha256="20963cd803b116d041795f50c607ddf837e7226bc46025997348fe1c2e5e35ca"
-
-gitlab_arm_source_sha256="dba6f34b23ba74765b03ce9521b16a5e951e6bd6d1f2fdcce692a58f43a4c48b"
-
-gitlab_filename="gitlab-ce-${gitlab_version}.deb"
diff --git a/scripts/upgrade.d/upgrade.11.9.8.sh b/scripts/upgrade.d/upgrade.11.9.8.sh
deleted file mode 100644
index f5fa9dc..0000000
--- a/scripts/upgrade.d/upgrade.11.9.8.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-gitlab_version="11.9.8"
-
-gitlab_x86_64_source_sha256="bb81616deeb92a4abf129373a4e6c9d246b37ad1ea707328efeec2fc0a07fc2a"
-
-gitlab_arm_source_sha256="1810be6f6780a700624343b976eace277ac6aefce51ec4341f549f7642be620f"
-
-gitlab_filename="gitlab-ce-${gitlab_version}.deb"
diff --git a/scripts/upgrade.d/upgrade.11.sh b/scripts/upgrade.d/upgrade.11.sh
new file mode 100644
index 0000000..f7981c3
--- /dev/null
+++ b/scripts/upgrade.d/upgrade.11.sh
@@ -0,0 +1,7 @@
+gitlab_version="11.11.5"
+
+gitlab_x86_64_source_sha256="1ee3d6e8d2cc198f5466de0884c03f6016299db24859126af9a191501dbdef10"
+
+gitlab_arm_source_sha256="366e12b1f3d3b1694fcb6f13da9de908360ba93f75768d97e8d01e61e8652705"
+
+gitlab_filename="gitlab-ce-${gitlab_version}.deb"

From 7931d8872592427b98d1c81c9932a96b61e74f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= <pierre.moltess@gmail.com>
Date: Thu, 4 Jul 2019 20:30:29 +0200
Subject: [PATCH 10/13] Actions are different between 11.x and 12.x

---
 scripts/install                   | 2 +-
 scripts/restore                   | 2 +-
 scripts/upgrade                   | 2 +-
 scripts/upgrade.d/upgrade.11.sh   | 6 ++++++
 scripts/upgrade.d/upgrade.last.sh | 5 +++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 29bd8f5..99402e0 100644
--- a/scripts/install
+++ b/scripts/install
@@ -184,7 +184,7 @@ ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ; 
 	then # This command will fail in lxc env
-		ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
+		package_check_action # defined in upgrade.d/upgrade.last.sh
 		ynh_exec_warn_less dpkg --configure gitlab-ce
 	fi
 else
diff --git a/scripts/restore b/scripts/restore
index 882a989..1aed979 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -118,7 +118,7 @@ ynh_setup_source --dest_dir=$tempdir --source_id=$architecture
 if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
 	then # This command will fail in lxc env
-		ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
+		package_check_action # defined in upgrade.d/upgrade.last.sh
 		ynh_exec_warn_less dpkg --configure gitlab-ce
 	fi
 else
diff --git a/scripts/upgrade b/scripts/upgrade
index 58a14d9..0078176 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -273,7 +273,7 @@ then
 		if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 			if ! ynh_exec_warn_less dpkg -i $tempdir/$gitlab_filename ;
 			then # This command will fail in lxc env
-				ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
+				package_check_action # defined in upgrade.d/upgrade.X.sh
 				ynh_exec_warn_less dpkg --configure gitlab-ce
 			fi
 		else
diff --git a/scripts/upgrade.d/upgrade.11.sh b/scripts/upgrade.d/upgrade.11.sh
index f7981c3..64724d0 100644
--- a/scripts/upgrade.d/upgrade.11.sh
+++ b/scripts/upgrade.d/upgrade.11.sh
@@ -5,3 +5,9 @@ gitlab_x86_64_source_sha256="1ee3d6e8d2cc198f5466de0884c03f6016299db24859126af9a
 gitlab_arm_source_sha256="366e12b1f3d3b1694fcb6f13da9de908360ba93f75768d97e8d01e61e8652705"
 
 gitlab_filename="gitlab-ce-${gitlab_version}.deb"
+
+# Action to do in case of failure of the package_check
+package_check_action() {
+        ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf  | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
+}
+
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index d491958..0c17ba1 100644
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -5,3 +5,8 @@ gitlab_x86_64_source_sha256="9e2dcb0e4e3ca3c230d43c6b8580d77c2c716f3c6d1055739f1
 gitlab_arm_source_sha256="992710fd2c4076961f03633cb6b56331f7ade63a6869c47c2ce28995f8b43893"
 
 gitlab_filename="gitlab-ce-${gitlab_version}.deb"
+
+# Action to do in case of failure of the package_check
+package_check_action() {
+		ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb"
+}

From 92d24470d066588c3fee3874b25b7857d64edd6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= <pierre.moltess@gmail.com>
Date: Thu, 4 Jul 2019 23:48:13 +0200
Subject: [PATCH 11/13] Fix the upgrade

---
 scripts/upgrade | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 0078176..74dd60d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -249,6 +249,11 @@ then
 
 		current_major_version=${current_version%%.*}
 
+		# If the current version is equal to the last minor version of upgrade.$current_major_version.sh, increment the major version
+		if [ "$gitlab_version" = "$current_version" ]; then
+			current_major_version=$(($current_major_version + 1))
+		fi
+
 		# If the current version has the same major version than the next one,
 		# then it's the last upgrade to do
 		if [ "$last_major_version" -eq "$current_major_version" ]; then

From 1ce0c92fd840e688e5e663205a5473fb522c2ae0 Mon Sep 17 00:00:00 2001
From: Kayou <pierre.moltess@gmail.com>
Date: Sun, 7 Jul 2019 13:41:43 +0200
Subject: [PATCH 12/13] Small missing space

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 74dd60d..6b0baed 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -343,4 +343,4 @@ ynh_systemd_action --action=reload --service_name=nginx
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of $app completed"--last
+ynh_script_progression --message="Upgrade of $app completed" --last

From 241178acdc9586d95c63810712ff35a83cbd37e6 Mon Sep 17 00:00:00 2001
From: Kayou <pierre.moltess@gmail.com>
Date: Wed, 10 Jul 2019 09:22:59 +0200
Subject: [PATCH 13/13] Temporary disable grafana

---
 conf/gitlab.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/gitlab.rb b/conf/gitlab.rb
index 2ed799f..07d55c1 100644
--- a/conf/gitlab.rb
+++ b/conf/gitlab.rb
@@ -1546,7 +1546,7 @@ nginx['listen_https'] = false
 ##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/#prometheus-as-a-grafana-data-source
 ################################################################################
 
-# grafana['enable'] = true
+grafana['enable'] = false
 # grafana['log_directory'] = '/var/log/gitlab/grafana'
 # grafana['home'] = '/var/opt/gitlab/grafana'
 # grafana['admin_password'] = 'admin'
@@ -2116,4 +2116,4 @@ nginx['listen_https'] = false
 #   }
 # }
 
-from_file '/etc/gitlab/gitlab-persistent.rb'
\ No newline at end of file
+from_file '/etc/gitlab/gitlab-persistent.rb'