Jeremy Kescher
7df41062ba
Merge branch 'glitch' into develop
2024-08-26 18:31:12 +02:00
Essem
c00f37f87b
Fix grouped reaction notification text
2024-08-26 18:29:06 +02:00
Matt Jankowski
4c2534d12e
Convert "static page" controller specs to system specs ( #31599 )
2024-08-26 15:53:48 +00:00
Matt Jankowski
963c1309a4
Cache asset compilation results on CI ( #30868 )
2024-08-26 15:20:05 +00:00
Matt Jankowski
dbe0ee8a81
Convert emojis controller spec to request spec ( #31597 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-08-26 15:00:05 +00:00
Matt Jankowski
5172d84946
Convert manifest controller spec to request spec ( #31596 )
2024-08-26 14:37:23 +00:00
Matt Jankowski
36ccdcc9e1
Convert "custom css" controller spec to request spec ( #31595 )
2024-08-26 14:36:31 +00:00
Matt Jankowski
641ae6a2cf
Convert health check endpoint controller spec to request spec ( #31565 )
2024-08-26 12:17:35 +00:00
renovate[bot]
e3516fa8cf
Update Yarn to v4.4.1 ( #31575 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-26 11:01:09 +00:00
Claire
a3c33c77ab
Fix typo in changelog ( #31591 )
2024-08-26 11:01:00 +00:00
renovate[bot]
3e1bd9756e
Update dependency brakeman to v6.2.1 ( #31553 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-26 08:50:40 +00:00
renovate[bot]
ccc0aea767
Update dependency bundler-audit to v0.9.2 ( #31558 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-26 08:48:04 +00:00
renovate[bot]
d0822a0e78
Update dependency test-prof to v1.4.1 ( #31561 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-26 08:47:21 +00:00
renovate[bot]
0422a5c208
Update dependency axios to v1.7.5 ( #31564 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-26 08:44:32 +00:00
Emelia Smith
c245a2044e
Streaming: Refactor to use metrics.$name instead of destructuring ( #31566 )
2024-08-26 08:08:21 +00:00
Renaud Chaput
f9f4006a1b
Update omniauth-rails_csrf_protection ( #31552 )
2024-08-26 07:51:21 +00:00
renovate[bot]
4cc589e533
Update dependency jsdom to v24.1.3 ( #31577 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-26 07:35:53 +00:00
Matt Jankowski
a6df125303
Fix Rails/CompactBlank cop ( #31581 )
2024-08-26 07:35:33 +00:00
Matt Jankowski
bcc4b1078c
Fix Rails/RootPathnameMethods cop ( #31582 )
2024-08-26 07:35:07 +00:00
renovate[bot]
5bcfe8d421
Update dependency @types/react to v18.3.4 ( #31586 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-26 07:34:16 +00:00
renovate[bot]
a6906e045b
Update devDependencies (non-major) ( #31587 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-26 07:34:01 +00:00
github-actions[bot]
626d44b6c6
New Crowdin Translations (automated) ( #31572 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-26 07:25:39 +00:00
Claire
3bfa5ffe29
Update dependency rexml ( #31590 )
2024-08-26 07:21:39 +00:00
Claire
ccd7eb397a
Merge pull request #2825 from ClearlyClaire/glitch-soc/fixes/nightly-tagging
...
Update github actions
2024-08-24 12:46:57 +02:00
Claire
f5d26225ed
Re-enable PR-needs-rebase action for glitch-soc (was disabled upstream for forks)
2024-08-24 12:33:09 +02:00
Claire
117af5847a
Disable tagging nightly images as latest
2024-08-24 12:32:48 +02:00
Claire
49671fe253
Merge pull request #2824 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 97f6baf977
2024-08-24 12:30:57 +02:00
Claire
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
Claire
97f6baf977
Bump version to v4.3.0-beta.1 ( #30989 )
2024-08-23 16:07:32 +00:00
Michael Stanclift
77c055b78c
Update Docker Compose for 4.3-beta ( #31554 )
2024-08-23 16:00:07 +00:00
Claire
c493689e84
Change output format of repo:changelog task ( #31546 )
2024-08-23 12:55:54 +00:00
Claire
ae9bd635e7
Merge pull request #2822 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to e08d22724d
2024-08-23 12:34:34 +02:00
github-actions[bot]
62be0234d5
New Crowdin Translations (automated) ( #31559 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-23 08:59:31 +00:00
David Roetzel
0374918746
Add spec for doorkeeper behavior around issuing tokens ( #31545 )
2024-08-23 08:20:32 +00:00
Matt Jankowski
6ec768668e
Remove nsa statsd integration (replaced by OpenTelemetry) ( #30240 )
2024-08-22 20:28:54 +00:00
Claire
532b53eece
Fix assets build issue due to slightly different webpack config
2024-08-22 22:23:06 +02:00
Claire
e18bd0450a
Extract strings removed upstream
2024-08-22 22:17:33 +02:00
Claire
7ce079cd26
[Glitch] Fix missing CSS in moderation interface
...
Port e08d22724d
2024-08-22 22:11:48 +02:00
Claire
dc70ef25b2
Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream
2024-08-22 22:09:10 +02:00
Claire
eae232fd01
Merge pull request #2821 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 98237207e6
2024-08-22 22:00:04 +02:00
Claire
e08d22724d
Fix missing CSS in moderation interface ( #31550 )
2024-08-22 18:57:22 +00:00
Claire
9f2d3c721c
[Glitch] Hide multiple selection bar for notification requests when no notificion requests are loaded
...
Port abe292b0ec
2024-08-22 20:00:19 +02:00
Emelia Smith
37f20514d3
[Glitch] Add button to view the Hashtag on the instance from Hashtags in Moderation UI
...
Port 376088f6da
2024-08-22 19:59:37 +02:00
Claire
18556d3e9b
Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream refactored some helpers and moved them in another file.
Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
Kept glitch-soc definitions where they are and moved upstream ones
as upstream did.
2024-08-22 19:54:20 +02:00
Eugen Rochko
500f4925a5
Change how content warnings and filters are displayed in web UI ( #31365 )
2024-08-22 17:12:35 +00:00
Claire
98237207e6
Fix unnecessary “next” link when API returns fewer notification requests than requested ( #31541 )
2024-08-22 13:42:04 +00:00
Claire
abe292b0ec
Hide multiple selection bar for notification requests when no notificion requests are loaded ( #31540 )
2024-08-22 13:42:02 +00:00
renovate[bot]
61d9704f6d
Update babel monorepo to v7.25.4 ( #31542 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-22 11:51:30 +00:00
renovate[bot]
c70dc5f0d7
Update dependency node to 20.17 ( #31531 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-22 11:50:46 +00:00
Renaud Chaput
4a968cb7a9
Add icon field to instance endpoint ( #30205 )
2024-08-22 10:04:27 +00:00
