me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39755 commits 2 branches 0 tags 429 MiB
Commit graph

39755 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Jankowski
25c66fa640
Enable paperclip for account attachment examples (#25381) 2023-06-12 17:37:43 +02:00
Eugen Rochko
94ef94c5ea Add unsubscribe link to e-mails (#25378) 2023-06-12 14:22:46 +02:00
Eugen Rochko
6637ef7852
Add unsubscribe link to e-mails (#25378) 2023-06-12 14:22:46 +02:00
Plastikmensch
a804371e21 [Glitch] Change "direct message" nomenclature to "private mention" in web UI (#2158) 
Port 868d478b1b to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-06-11 13:33:45 +02:00
Plastikmensch
fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI (#2158) 
Port 68a192e718 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-06-11 13:33:45 +02:00
Claire
7fca33ee15 Merge pull request #2246 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-06-11 09:58:55 +02:00
Claire
af97a6ac5a
Merge pull request #2246 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-06-11 09:58:55 +02:00
alfe
569ff79fb8 Rewrite <LoadPending /> as FC and TS (#25363) 2023-06-11 04:47:18 +02:00
alfe
dfaf59d99a
Rewrite <LoadPending /> as FC and TS (#25363) 2023-06-11 04:47:18 +02:00
Eugen Rochko
272e099bce Change "bot" label to "automated" (#25356) 2023-06-11 04:47:07 +02:00
Eugen Rochko
432a5d2d4b
Change "bot" label to "automated" (#25356) 2023-06-11 04:47:07 +02:00
Claire
f49b12e06d Fix some translation strings inconsistencies 2023-06-10 19:21:44 +02:00
Claire
20718a8b59 Fix some translation strings inconsistencies 2023-06-10 19:21:44 +02:00
Claire
1c25f35ddf Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.
 2023-06-10 18:42:29 +02:00
Claire
42a0898f16 Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.
 2023-06-10 18:42:29 +02:00
Matt Jankowski
a3c439de66 Reduce RSpec/MultipleExpectations cop max to 8 (#25313) 2023-06-10 18:38:22 +02:00
Matt Jankowski
62c996b52d
Reduce RSpec/MultipleExpectations cop max to 8 (#25313) 2023-06-10 18:38:22 +02:00
Matt Jankowski
61a9504522 Add coverage for CLI::Feeds command (#25319) 2023-06-10 18:37:36 +02:00
Matt Jankowski
b5675e265e
Add coverage for CLI::Feeds command (#25319) 2023-06-10 18:37:36 +02:00
Matt Jankowski
4d21dbfa23 Add coverage for CLI::Cache command (#25238) 2023-06-10 18:36:09 +02:00
Matt Jankowski
07933db788
Add coverage for CLI::Cache command (#25238) 2023-06-10 18:36:09 +02:00
Emelia Smith
34c9ee4a66 Add logging of websocket send errors (#25280) 2023-06-10 18:35:57 +02:00
Emelia Smith
215081240f
Add logging of websocket send errors (#25280) 2023-06-10 18:35:57 +02:00
fusagiko / takayamaki
c31e2b3267 migrate test for GET /api/v1/accounts/{account_id} to request spec (#25322) 2023-06-10 18:33:24 +02:00
fusagiko / takayamaki
b19a695608
migrate test for GET /api/v1/accounts/{account_id} to request spec (#25322) 2023-06-10 18:33:24 +02:00
Daniel M Brasil
e2323fdcf6 Migrate to request specs in /api/v1/admin/canonical_email_blocks (#25330) 2023-06-10 18:33:02 +02:00
Daniel M Brasil
99216e34e5
Migrate to request specs in /api/v1/admin/canonical_email_blocks (#25330) 2023-06-10 18:33:02 +02:00
Daniel M Brasil
e359a19387 Migrate to request specs in /api/v1/admin/ip_blocks (#25331) 2023-06-10 18:32:46 +02:00
Daniel M Brasil
b4e19f9610
Migrate to request specs in /api/v1/admin/ip_blocks (#25331) 2023-06-10 18:32:46 +02:00
Daniel M Brasil
9c7f3acaf6 Migrate to request specs in /api/v1/admin/domain_allows (#25333) 2023-06-10 18:32:26 +02:00
Daniel M Brasil
4301d8cbb3
Migrate to request specs in /api/v1/admin/domain_allows (#25333) 2023-06-10 18:32:26 +02:00
Daniel M Brasil
70cc460c39 Migrate to request specs in /api/v1/admin/domain_blocks (#25335) 2023-06-10 18:32:07 +02:00
Daniel M Brasil
841c220c40
Migrate to request specs in /api/v1/admin/domain_blocks (#25335) 2023-06-10 18:32:07 +02:00
Daniel M Brasil
1a723c3425 Migrate to request specs in /api/v1/admin/reports (#25355) 2023-06-10 18:30:43 +02:00
Daniel M Brasil
0e200d4e2f
Migrate to request specs in /api/v1/admin/reports (#25355) 2023-06-10 18:30:43 +02:00
Matt Jankowski
23c3e09853 Use build where possible in fabricators (#25360) 2023-06-10 18:29:01 +02:00
Matt Jankowski
3a2a15c6ea
Use build where possible in fabricators (#25360) 2023-06-10 18:29:01 +02:00
Matt Jankowski
c4eba4b0d9 Disable paperclip processing in specs (#25359) 2023-06-10 18:27:35 +02:00
Matt Jankowski
c94bb9ba9a
Disable paperclip processing in specs (#25359) 2023-06-10 18:27:35 +02:00
Emelia Smith
90070920bf Fix logging of messages that are binary before closing their connection (#25361) 2023-06-10 18:24:37 +02:00
Emelia Smith
c81f59583c
Fix logging of messages that are binary before closing their connection (#25361) 2023-06-10 18:24:37 +02:00
Claire
14788cf0ce Switch to using a common runtime chunk rather than locales 2023-06-10 17:43:13 +02:00
Claire
34efd1a24c Switch to using a common runtime chunk rather than locales 2023-06-10 17:43:13 +02:00
Claire
c51e8de4ad Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream fixed a translation bug in the theme selector that is absent from
  glitch-soc due to our different theming system.
  Discarded upstream changes.
- `streaming/index.js`:
  Upstream changed the signature of a function to change its return type.
  This is not a real conflict, the conflict being caused by an extra
  argument in glitch-soc's code.
  Applied upstream's change while keeping our extra argument.
 2023-06-10 17:18:36 +02:00
Claire
8c26d49cbd Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream fixed a translation bug in the theme selector that is absent from
  glitch-soc due to our different theming system.
  Discarded upstream changes.
- `streaming/index.js`:
  Upstream changed the signature of a function to change its return type.
  This is not a real conflict, the conflict being caused by an extra
  argument in glitch-soc's code.
  Applied upstream's change while keeping our extra argument.
 2023-06-10 17:18:36 +02:00
Eugen Rochko
b5872b0686 [Glitch] Change design of dropdowns in web UI 
Port 7abfddd8a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 17:10:06 +02:00
Eugen Rochko
fb0d2de8fe [Glitch] Change design of dropdowns in web UI 
Port e4fd9503ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 17:10:06 +02:00
alfe
ee6682e48d [Glitch] Rewrite <LoadMore /> as FC and TS 
Port f9c819e8db to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:59:25 +02:00
alfe
83ae40e192 [Glitch] Rewrite <LoadMore /> as FC and TS 
Port fb5bf5cbf8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 16:59:25 +02:00
Claire
ee1de4206a Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
 2023-06-10 16:48:01 +02:00