From c8ed3c3c06e780df2dc40875581cb3ea9f348bd3 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sun, 6 May 2018 19:42:33 +0200 Subject: [PATCH] Upgrade to upstream version 1.9.7 --- README.md | 2 +- check_process | 8 ++++---- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e096583..4ba6788 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Finally, if installing on a low-end ARM device (e.g. Raspberry Pi), first access To learn more about the philosophy and goals of the project, [visit **discourse.org**](http://www.discourse.org). -**Shipped version:** 1.9.6 +**Shipped version:** 1.9.7 ## Screenshots diff --git a/check_process b/check_process index 089d350..13bb4ac 100644 --- a/check_process +++ b/check_process @@ -12,10 +12,10 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=0fae168464002327d44c923d1ff199e4b910a1d1 + upgrade=1 from_commit=f67986641f48d9e7b5df99f13fefe460094a5d81 backup_restore=1 # Activate multi-instance test only if you have more than 2Gb RAM! - multi_instance=0 + multi_instance=1 incorrect_path=1 port_already_use=0 change_url=0 @@ -36,6 +36,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=0fae168464002327d44c923d1ff199e4b910a1d1 - name=Add README, LICENSE, check_process + ; commit=f67986641f48d9e7b5df99f13fefe460094a5d81 + name=Use unicorn instead of puma, hence not needing a separate sidekiq ser manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1& diff --git a/conf/app.src b/conf/app.src index 3fba680..e3745a9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,3 @@ -SOURCE_URL=https://github.com/discourse/discourse/archive/v1.9.6.tar.gz -SOURCE_SUM=336193db2677c9061c1a339b874acd96cae1fc7e4fed2566e2c86a0d7d186c9d +SOURCE_URL=https://github.com/discourse/discourse/archive/v1.9.7.tar.gz +SOURCE_SUM=780e30318b1c0f7c79f788418990dee8e319e11015bcb66687a5bdc11e437363 SOURCE_FORMAT=tar.gz diff --git a/manifest.json b/manifest.json index c0e1202..00bae2b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "photo gallery", "fr": "Galerie photo" }, - "version": "1.9.6~ynh1", + "version": "1.9.7~ynh1", "url": "http://Discourse.org", "license": "GPL-2.0", "maintainer": {