merge upstream #2
oat
commented 2022-11-17 00:39:46 +01:00
Owner
No description provided.
oat
added 33 commits 2022-11-17 00:39:46 +01:00
ceafd1f68f
Fix infinite loop when system emoji font is enabled (#1931)
8c3c6dcae9
Fix filters from other users being used in the streaming service (#20719)
66461ae79a
Merge branch 'main' into glitch-soc/merge-upstream
eb675af0fb
Merge pull request #1932 from ClearlyClaire/glitch-soc/merge-upstream
17bd9a87b9
Fix wrong color on mentions hidden behind content warning in web UI (#20724)
b59683c156
Bump nokogiri from 1.13.8 to 1.13.9 (#20041)
b46b7c3d5e
Use "unsafe-wasm-eval" instead of "unsafe-eval" in script-src CSP (#20606)
43b0b2f3f4
Fix wrong directive `unsafe-wasm-eval` to `wasm-unsafe-eval` (#20729)
03b0f3ac83
Bump version to 4.0.2 (#20725)
a1738f8991
New Crowdin updates (#20580)
66a22ab391
Bump promise.prototype.finally from 3.1.3 to 3.1.4 (#20050)
3b82d1ef68
Bump reselect from 4.1.6 to 4.1.7 (#20052)
61264e52cc
Bump memory_profiler from 1.0.0 to 1.0.1 (#20054)
c76f29ae45
Bump tzinfo-data from 1.2022.4 to 1.2022.6 (#20056)
fc4452104c
Bump json-ld-preloaded from 3.2.0 to 3.2.2 (#20058)
4ef4db2a5a
Bump loader-utils from 1.4.0 to 1.4.1 (#20085)
3301aadba8
Bump redux-thunk from 2.4.1 to 2.4.2 (#20060)
9f95c419d2
Bump yargs from 17.6.0 to 17.6.2 (#20063)
dba1645bf0
Bump postcss from 8.4.18 to 8.4.19 (#20684)
ca6106603b
Bump array-includes from 3.1.5 to 3.1.6 (#20680)
dd360e653e
Bump blurhash from 2.0.3 to 2.0.4 (#19601)
acbf4d0dfe
Bump jsdom from 20.0.1 to 20.0.2 (#19603)
f32c2de6af
Bump pg from 1.4.3 to 1.4.4 (#19597)
dde60e2634
Bump object.values from 1.1.5 to 1.1.6 (#20047)
575bf3fa20
Bump oj from 3.13.21 to 3.13.23 (#20046)
f7d261cac7
Bump sidekiq from 6.5.7 to 6.5.8 (#20035)
ac7a29f068
Bump loader-utils from 1.4.1 to 1.4.2 (#20826)
4d85c27d1a
Add 'private' to Cache-Control, match Rails expectations (#20608)
1901829f9a
Merge branch 'main' into glitch-soc/merge-upstream
7efe2cf00f
Modify image build workflow for Glitch workflows (#1942)
ad84fd25f1
Merge pull request #1941 from ClearlyClaire/glitch-soc/merge-upstream
8c56441b4a
Add form-action CSP directive (#1948)
23ea0e7508
Add aria-label and title attributes to local settings navigation items (#1949)
oat
merged commit dec38b4b98 into main 2022-11-17 00:39:52 +01:00
oat
referenced this issue from a commit 2022-11-17 00:39:52 +01:00
Merge pull request 'merge upstream' (#2) from remote/mastodon:main into main
Loading…
Reference in New Issue
No description provided.
Delete Branch ":main"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?