From c31912b790ad84dd18b53d625b1389bc03988064 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 7 Apr 2020 02:53:00 +0200
Subject: [PATCH] Upgrade to 3.1.3

---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 conf/app.src    | 4 ++--
 manifest.json   | 2 +-
 scripts/install | 3 ---
 scripts/upgrade | 3 ---
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 30abd8e..e1f6aba 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.
 
-**Shipped version:** 3.1.2
+**Shipped version:** 3.1.3
 
 ## Important points to read before installing
 
diff --git a/README_fr.md b/README_fr.md
index 78e6170..14cfe60 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 ## Vue d'ensemble
 Mastodon est un réseau social gratuit et open source. Une alternative décentralisée aux plates-formes commerciales, elle évite les risques d'une seule société qui monopolise votre communication. Choisissez un serveur sur lequel vous faites confiance - selon votre choix, vous pouvez interagir avec tous les autres. N'importe qui peut exécuter sa propre instance de Mastodon et participer au réseau social de façon transparente.
 
-**Version incluse:** 3.1.2
+**Version incluse:** 3.1.3
 
 ## Points importants à lire avant l'installation
 
diff --git a/conf/app.src b/conf/app.src
index fc275ee..e2a10d0 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.2.tar.gz
-SOURCE_SUM=c12fd8c1b426861825d37d2eab1d6356be05b2b321eae0c1b87f80fcc11b0da7 
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.3.tar.gz
+SOURCE_SUM=4f463ed6b1962cb13e0c577a9f9c380d11587f896a293b381662668b1c9a3f0e 
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 2792cd4..0c1241e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Mastodon is a free, open-source social network.",
 		"fr": "Mastodon est un réseau social gratuit et open source."
 	},
-	"version": "3.1.2~ynh2",
+	"version": "3.1.3~ynh1",
 	"url": "https://github.com/tootsuite/mastodon",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": [
diff --git a/scripts/install b/scripts/install
index 7d7d4b8..989954b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -110,9 +110,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 mkdir $final_path
 ynh_setup_source  --dest_dir="$final_path/live"
 
-# Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
-ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 0bc44b3..ce71ee1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -185,9 +185,6 @@ then
     ynh_secure_remove --file="$final_path/live/"
     ynh_setup_source --dest_dir="$final_path/live"
 
-    # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292
-    ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock"
-    
     if [ -d "$tmpdir/system" ]; then
 	    rsync -a "$tmpdir/system" "$final_path/live/public/."
     fi