YunoHost-Apps/discourse_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/discourse_ynh.git synced 2024-09-03 18:26:18 +02:00
Code Issues Activity Actions

Update patches

Browse source
This commit is contained in:
Félix Piédallu 2024-08-30 11:55:29 +02:00
parent bd1620cd9e
commit 19d4227e70
4 changed files with 63 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
sources/patches/main-4-fix-missing-git-repository.patch
View file

@ -1,35 +1,31 @@
From 2319de5a4759f17c11a6000779d1c8840c342771 Mon Sep 17 00:00:00 2001
From 17a2d3241889c117ac5bb15d0609837592b16cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Fri, 26 Jul 2024 14:19:22 +0200
Subject: [PATCH 2/3] Fix missing git commands in repository
Date: Fri, 30 Aug 2024 11:50:04 +0200
Subject: [PATCH] Fix missing git commands in repository
---
lib/discourse.rb | 5 +++--
lib/git_utils.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 1af04378..6207c8f5 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -842,7 +842,7 @@ module Discourse
@full_version ||=
begin
git_cmd = 'git describe --dirty --match "v[0-9]*" 2> /dev/null'
- self.try_git(git_cmd, "unknown")
+ self.try_git(git_cmd, Discourse::VERSION::STRING)
end
diff --git a/lib/git_utils.rb b/lib/git_utils.rb
index fb664fe2..aa81fd2d 100644
--- a/lib/git_utils.rb
+++ b/lib/git_utils.rb
@@ -11,12 +11,13 @@ class GitUtils
end
@@ -850,7 +850,8 @@ module Discourse
@last_commit_date ||=
begin
git_cmd = 'git log -1 --format="%ct"'
- seconds = self.try_git(git_cmd, nil)
+ # Note(decentral1se): Output from actual command in the v3.2.4 branch
+ seconds = self.try_git(git_cmd, '1721046633')
seconds.nil? ? nil : DateTime.strptime(seconds, "%s")
end
def self.full_version
- self.try_git('git describe --dirty --match "v[0-9]*" 2> /dev/null', "unknown")
+ self.try_git('git describe --dirty --match "v[0-9]*" 2> /dev/null', Discourse::VERSION::STRING)
end
def self.last_commit_date
git_cmd = 'git log -1 --format="%ct"'
- seconds = self.try_git(git_cmd, nil)
+ # Note(decentral1se): Output from actual command in the v3.2.4 branch
+ seconds = self.try_git(git_cmd, '1721046633')
seconds.nil? ? nil : DateTime.strptime(seconds, "%s")
end
--
2.45.2
2.43.0

18
sources/patches/main-5-fix-admin-watched-words-action.patch
View file

@ -1,8 +1,17 @@
From 714ba4449257b3770dfe991b1a19bda0b147d56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix.piedallu@semtech.com>
Date: Fri, 30 Aug 2024 11:52:09 +0200
Subject: [PATCH] Fix admin-watched-words-action.js
---
.../admin/addon/controllers/admin-watched-words-action.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
index 2b53a91eb3..eec55647d5 100644
index d5ad0c49..faeb04ab 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
@@ -32,9 +32,9 @@
@@ -37,7 +37,7 @@ export default class AdminWatchedWordsActionController extends Controller {
for (const { regexp, word } of words) {
try {
RegExp(regexp);
@ -11,5 +20,6 @@ index 2b53a91eb3..eec55647d5 100644
return I18n.t("admin.watched_words.invalid_regex", { word });
}
}
},
--
2.43.0

18
sources/patches/main-6-fix-download-calendar.patch
View file

@ -1,25 +1,25 @@
From e515c68e1011d42f5fd817a799f4694fb469eea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Fri, 26 Jul 2024 14:20:17 +0200
Subject: [PATCH 3/3] Fix download calendar
From c4f4fb51b0b12c520bf78870842c4c0034296323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix.piedallu@semtech.com>
Date: Fri, 30 Aug 2024 11:53:46 +0200
Subject: [PATCH] Fix download-calendar.js
---
app/assets/javascripts/discourse/app/lib/download-calendar.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/assets/javascripts/discourse/app/lib/download-calendar.js b/app/assets/javascripts/discourse/app/lib/download-calendar.js
index 238a8cf0..541b6b1b 100644
index 3fd2951a..b71e4e09 100644
--- a/app/assets/javascripts/discourse/app/lib/download-calendar.js
+++ b/app/assets/javascripts/discourse/app/lib/download-calendar.js
@@ -23,7 +23,7 @@ export function downloadCalendar(title, dates, recurrenceRule = null) {
@@ -23,7 +23,7 @@ export function downloadCalendar(title, dates, options = {}) {
}
export function downloadIcs(title, dates, recurrenceRule) {
export function downloadIcs(title, dates, options = {}) {
- const REMOVE_FILE_AFTER = 20_000;
+ const REMOVE_FILE_AFTER = 20000;
const file = new File([generateIcsData(title, dates, recurrenceRule)], {
const file = new File([generateIcsData(title, dates, options)], {
type: "text/plain",
});
--
2.45.2
2.43.0

24
sources/patches/main-7-fix-uppy-upload.patch
View file

@ -1,13 +1,25 @@
From c1dc85c042033cd689346d0bf6e747a97f4c4e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix.piedallu@semtech.com>
Date: Fri, 30 Aug 2024 11:55:03 +0200
Subject: [PATCH] Fix uppy-upload.js
---
app/assets/javascripts/discourse/app/mixins/uppy-upload.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js
index 2b53a91eb3..eec55647d5 100644
index ff2a0e95..50be945e 100644
--- a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js
+++ b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js
@@ -21,7 +21,7 @@
import { warn } from "@ember/debug";
import bootbox from "bootbox";
@@ -23,7 +23,7 @@ import { deepMerge } from "discourse-common/lib/object";
import { bind, on } from "discourse-common/utils/decorators";
import I18n from "discourse-i18n";
-export const HUGE_FILE_THRESHOLD_BYTES = 104_857_600; // 100MB
+export const HUGE_FILE_THRESHOLD_BYTES = "104_857_600"; // 100MB
export default Mixin.create(UppyS3Multipart, {
uploading: false,
export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
dialog: service(),
--
2.43.0