Commit graph

23390 commits

Author SHA1 Message Date
Jeremy Kescher 9c355a240b
Merge remote-tracking branch 'upstream/main' into develop 2024-08-31 12:53:19 +02:00
Claire d46bf54925
Merge pull request #2828 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 04f0468016
2024-08-27 22:56:55 +02:00
Claire 435ff8e550 [Glitch] Add ability for admins to force grouped notifications in web UI
Port c73868cd78 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-27 20:33:50 +02:00
Eugen Rochko e15fad27bc [Glitch] Change design of boost modal in web UI
Port 29b9642b31 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-27 20:33:50 +02:00
Emelia Smith d3629d191f [Glitch] Add quick links to Administration and Moderation Reports from Web UI
Port d820c0883d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-27 20:16:52 +02:00
Claire 94d8cdc494 Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream 2024-08-27 20:00:07 +02:00
Claire 51311f97fb
Merge pull request #2827 from ClearlyClaire/glitch-soc/fixes/report-old-notifications-target
Fix target account link in old report notifications
2024-08-27 19:09:20 +02:00
Claire 33ad67fcea Fix target account link in old report notifications 2024-08-27 18:11:14 +02:00
Renaud Chaput 04f0468016
Fix streaming image with Docker Compose (#31615) 2024-08-27 16:05:19 +00:00
Matt Jankowski 6eba057e64
Cache rspec persistence file between CI runs (#31065) 2024-08-27 15:23:08 +00:00
Matt Jankowski 3959f36d19
Add checks about response body content to admin/dash spec (#30716) 2024-08-27 14:59:56 +00:00
Claire c73868cd78
Add ability for admins to force grouped notifications in web UI (#31610) 2024-08-27 14:55:51 +00:00
Renaud Chaput da42e9d446
Fix typo in Compose file (#31612) 2024-08-27 12:51:34 +00:00
renovate[bot] c513fdb9c5
Update dependency pundit to v2.4.0 (#31598)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-27 09:51:29 +00:00
Matt Jankowski 48f4e5444d
Convert media_proxy controller spec to request spec (#31600) 2024-08-27 09:44:16 +00:00
Emelia Smith 4118688fba
Streaming: Refactor move database and redis logic into separate files (#31567) 2024-08-27 08:40:04 +00:00
Matt Jankowski a7f8417795
Convert "CSV export" settings controller specs to request specs (#31601) 2024-08-27 08:12:39 +00:00
Matt Jankowski 38a3466741
Convert api/oembed controller spec to request spec (#31605) 2024-08-27 07:55:25 +00:00
github-actions[bot] 0e7c88aa6d
New Crowdin Translations (automated) (#31609)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-27 07:54:58 +00:00
Matt Jankowski c09d232ee3
Convert api/web/settings controller spec to request spec (#31606) 2024-08-27 07:42:35 +00:00
Matt Jankowski 14d7fe05d0
Use describe instead of context in top-level spec declaration (#31607) 2024-08-27 07:40:18 +00:00
Claire 11014ac414
Merge pull request #2826 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to e38ce3beb7
2024-08-26 21:08:23 +02:00
Eugen Rochko 29b9642b31
Change design of boost modal in web UI (#31555) 2024-08-26 17:12:17 +00:00
Claire 8f678a3cf4 Fix tests for glitch-soc 2024-08-26 19:08:42 +02:00
Jeremy Kescher 232b6409f5
New versioning scheme, bump Catstodon revision to 1.0.0
Some checks failed
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-08-26 19:07:22 +02:00
Claire 2379bfe3ea [Glitch] Fix spurious loading bar middleware usage
Port e38ce3beb7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-26 18:54:27 +02:00
Claire 11b8017b45 Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream 2024-08-26 18:52:33 +02:00
Emelia Smith d820c0883d
Add quick links to Administration and Moderation Reports from Web UI (#24838) 2024-08-26 16:42:46 +00:00
Claire e38ce3beb7
Fix spurious loading bar middleware usage (#31592) 2024-08-26 16:38:34 +00:00
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