post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge commit 'c1e70a2072' into kb_migration_development

Browse source
This commit is contained in:
KMY 2023-05-20 22:00:28 +09:00
commit dd05f2b58c
15 changed files with 89 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/utils/__tests__/html-test.js
View file

@ -1,7 +1,7 @@
import * as html from '../html';
describe('html', () => {
describe('unsecapeHTML', () => {
describe('unescapeHTML', () => {
it('returns unescaped HTML', () => {
const output = html.unescapeHTML('<p>lorem</p><p>ipsum</p><br>&lt;br&gt;');
expect(output).toEqual('lorem\n\nipsum\n<br>');

2
app/workers/post_process_media_worker.rb
View file

@ -24,7 +24,7 @@ class PostProcessMediaWorker
media_attachment.processing = :in_progress
media_attachment.save
# Because paperclip-av-transcover overwrites this attribute
# Because paperclip-av-transcoder overwrites this attribute
# we will save it here and restore it after reprocess is done
previous_meta = media_attachment.file_meta