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

6528 commits

Author SHA1 Message Date
Claire
2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
 2023-08-22 18:31:28 +02:00
Claire
b6ca020d02 Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
 2023-08-22 18:31:28 +02:00
Renaud Chaput
bb2db2aec0
Add circular-dependency-plugin to detect any circular deps issues (#26600) 2023-08-22 13:24:16 +02:00
Renaud Chaput
78aecc7444 Add circular-dependency-plugin to detect any circular deps issues (#26600) 2023-08-22 13:24:16 +02:00
Claire
7e25e311d5 Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream 2023-08-21 21:07:39 +02:00
Claire
ccf5f88e43 Merge commit '89b675cb07886dcc72ef52b6f778679d7099d96c' into glitch-soc/merge-upstream 2023-08-21 21:07:39 +02:00
Claire
ac0eb0533e
Add Elasticsearch cluster health check and indexes mismatch check to dashboard (#26448) 2023-08-21 16:50:22 +02:00
Claire
0ce3130ef8 Add Elasticsearch cluster health check and indexes mismatch check to dashboard (#26448) 2023-08-21 16:50:22 +02:00
Claire
191d302b7f
Refactor Api::V1::ProfilesController into two separate controllers (#26573) 2023-08-21 15:47:09 +02:00
Claire
5458629e60 Refactor Api::V1::ProfilesController into two separate controllers (#26573) 2023-08-21 15:47:09 +02:00
Daniel M Brasil
d24a87ce4f
Add ability to delete avatar or header picture via the API (#25124) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-21 08:44:35 +02:00
Daniel M Brasil
89d2b28e0b Add ability to delete avatar or header picture via the API (#25124) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-21 08:44:35 +02:00
Renaud Chaput
b95867ad1f
Allow setting a custom HTTP method in CacheBuster (#26528) 
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
 2023-08-18 08:18:40 +02:00
Renaud Chaput
f4a6879caf Allow setting a custom HTTP method in CacheBuster (#26528) 
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
 2023-08-18 08:18:40 +02:00
Claire
cc4560d95b
Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach (#26508) 2023-08-17 09:13:26 +02:00
Claire
4b4228c0cd Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach (#26508) 2023-08-17 09:13:26 +02:00
Claire
dd049fc37a
Fix ES_PRESET not being applied to Chewy's internal index (#26489) 2023-08-14 19:00:56 +02:00
Claire
90e403ba4d Fix ES_PRESET not being applied to Chewy's internal index (#26489) 2023-08-14 19:00:56 +02:00
Claire
fc5ab2dc83
Add privacy tab in profile settings (#26484) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 18:52:45 +02:00
Claire
738b024d0c Add privacy tab in profile settings (#26484) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 18:52:45 +02:00
Claire
f5778caa3a
Add ES_PRESET option to customize numbers of shards and replicas (#26483) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 17:46:16 +02:00
Claire
6c6f3c9148 Add ES_PRESET option to customize numbers of shards and replicas (#26483) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 17:46:16 +02:00
github-actions[bot]
c452ccd913
New Crowdin Translations (automated) (#26444) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-14 14:54:31 +02:00
github-actions[bot]
30f84f10b1 New Crowdin Translations (automated) (#26444) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-14 14:54:31 +02:00
Claire
6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
 2023-08-13 18:47:15 +02:00
Claire
33024cca51 Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
 2023-08-13 18:47:15 +02:00
Kouhai
f8028d190e th: Merge remote-tracking branch 'glitch/main' 2023-08-12 18:54:16 -07:00
Claire
ea8802a05a Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream 2023-08-12 09:36:38 +02:00
Claire
6d6acefcc1 Merge commit '788d7a6a2a4582601dd741ad880ef7b775335d14' into glitch-soc/merge-upstream 2023-08-12 09:36:38 +02:00
Claire
32faa7213f Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
 2023-08-11 22:15:41 +02:00
Claire
44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
 2023-08-11 22:15:41 +02:00
Claire
4bc0dd751c
Add S3_DISABLE_CHECKSUM_MODE environment variable for compatibility with some S3-compatible providers (#26435) 2023-08-10 14:15:18 +02:00
Claire
80e6e7d008 Add S3_DISABLE_CHECKSUM_MODE environment variable for compatibility with some S3-compatible providers (#26435) 2023-08-10 14:15:18 +02:00
github-actions[bot]
8cbf4a5296
New Crowdin Translations (automated) (#26373) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-10 09:47:42 +02:00
github-actions[bot]
ef78647bb0 New Crowdin Translations (automated) (#26373) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-10 09:47:42 +02:00
Claire
2c204d904b
Change DB_REPLICA_* environment variables to REPLICA_DB_* (#26386) 2023-08-08 13:59:40 +02:00
Claire
dd4eab6536 Change DB_REPLICA_* environment variables to REPLICA_DB_* (#26386) 2023-08-08 13:59:40 +02:00
github-actions[bot]
d2dbaba407
New Crowdin Translations (automated) (#26209) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-07 13:37:54 +02:00
github-actions[bot]
93b225dfde New Crowdin Translations (automated) (#26209) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-07 13:37:54 +02:00
Claire
12c43e4ab5
Re-add StatsD support through the nsa gem (#26310) 2023-08-03 20:28:14 +02:00
Claire
cb95239c96 Re-add StatsD support through the nsa gem (#26310) 2023-08-03 20:28:14 +02:00
Claire
3105fef21a
Rename “read” database to “replica” for consistency (#26326) 2023-08-03 16:17:09 +02:00
Claire
aa0777aefc Rename “read” database to “replica” for consistency (#26326) 2023-08-03 16:17:09 +02:00
Daniel M Brasil
3a4d3e9d4b
Add GET /api/v1/instance/languages to REST API (#24443) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-03 11:25:47 +02:00
Daniel M Brasil
788d7a6a2a Add GET /api/v1/instance/languages to REST API (#24443) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-03 11:25:47 +02:00
Eugen Rochko
a0fad5c8bb
Change indexing frequency from 5 minutes to 1 minute, add locks to schedulers (#26304) 2023-08-03 11:04:05 +02:00
Eugen Rochko
4c8daf28bb Change indexing frequency from 5 minutes to 1 minute, add locks to schedulers (#26304) 2023-08-03 11:04:05 +02:00
Emelia Smith
e395939ead Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252) 2023-08-02 19:32:48 +02:00
Emelia Smith
e258b4cb64
Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252) 2023-08-02 19:32:48 +02:00
Eugen Rochko
9a214a414e Change design of role badges in web UI (#26281) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-02 17:24:32 +02:00
Eugen Rochko
2cbdff97ce
Change design of role badges in web UI (#26281) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-02 17:24:32 +02:00
Christian Schmidt
8674743cc0 Fix AVIF attachments (#26264) 2023-08-01 19:34:11 +02:00
Christian Schmidt
f2257069b2
Fix AVIF attachments (#26264) 2023-08-01 19:34:11 +02:00
Claire
a84632b619 Fix CSP tests in glitch-soc 2023-07-30 17:30:13 +02:00
Claire
73a3228e0f Fix CSP tests in glitch-soc 2023-07-30 17:30:13 +02:00
Claire
84bc751433 Merge commit '6a19d5ce9942686e0cda1a9decec349d0a1f4e26' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
 2023-07-30 16:11:55 +02:00
Claire
92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
 2023-07-30 16:11:55 +02:00
Claire
68d080177a Merge commit 'eb1139fd42203ad966810f7f7ed6b55949ac7e8a' into glitch-soc/merge-upstream 2023-07-30 15:54:34 +02:00
Claire
454d8567d4 Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream 2023-07-30 15:54:34 +02:00
Claire
f55959ebd9 Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
 2023-07-30 14:58:56 +02:00
Claire
bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
 2023-07-30 14:58:56 +02:00
Claire
1039fce896 Merge commit '5a5d8a97579bf2da481871588425734678019f52' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
Claire
b2515feb29 Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
Claire
cb4ffdea8b Merge commit '1d3f8af23a23c2d3d8399d7b4367de69b72e269a' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
 2023-07-30 13:49:35 +02:00
Claire
42f36aa55a Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
 2023-07-30 13:49:35 +02:00
Claire
db809f8789 Merge commit 'f3127af389f6043fe19c9ef4addefb6c6da0095a' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
 2023-07-30 13:42:06 +02:00
Claire
7635c67450 Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed the `crossorigin` attribute from `preload_pack_asset`.
  Glitch-soc had different calls to `preload_pack_asset` because of the
  different theming system.
  Ported the change.
 2023-07-30 13:42:06 +02:00
Claire
2f3f1d75fa Merge commit '58b52b7a33717406faa8d988b7c05efa52f46f6a' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
 2023-07-30 13:15:01 +02:00
Claire
993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
 2023-07-30 13:15:01 +02:00
Christian Schmidt
988898a8f3 Remove obsolete backport from Rails 7 (#26254) 2023-07-29 22:28:05 +02:00
Christian Schmidt
d76f79f647
Remove obsolete backport from Rails 7 (#26254) 2023-07-29 22:28:05 +02:00
Matt Jankowski
c7b9089646 Ignore the brakeman PermitAttributes check (#25915) 2023-07-28 23:17:53 +02:00
Matt Jankowski
74903af7ce
Ignore the brakeman PermitAttributes check (#25915) 2023-07-28 23:17:53 +02:00
Matt Jankowski
2e932c05f8 Update rubocop rules for linelength (#26190) 2023-07-28 23:11:45 +02:00
Matt Jankowski
ad81be6c8e
Update rubocop rules for linelength (#26190) 2023-07-28 23:11:45 +02:00
Renaud Chaput
ece7e570ff Add end-to-end (system) tests (#25461) 2023-07-28 23:09:49 +02:00
Renaud Chaput
4d1b67f664
Add end-to-end (system) tests (#25461) 2023-07-28 23:09:49 +02:00
github-actions[bot]
df7c9e1ed4 New Crowdin translations (#2327) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-27 19:25:29 +02:00
github-actions[bot]
8864d5b580
New Crowdin translations (#2327) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-27 19:25:29 +02:00
Claire
20809d5d8c Change interaction modal in web UI (#26075) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-07-27 16:11:17 +02:00
Claire
b4e739ff0f
Change interaction modal in web UI (#26075) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-07-27 16:11:17 +02:00
Matt Jankowski
991df39b0a Remove the sr locale override .rb files (#25927) 2023-07-26 15:39:53 +02:00
Matt Jankowski
b06763dc11
Remove the sr locale override .rb files (#25927) 2023-07-26 15:39:53 +02:00
github-actions[bot]
4a9961e904 New Crowdin Translations (automated) (#26072) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-26 13:46:16 +02:00
github-actions[bot]
b9adea9695
New Crowdin Translations (automated) (#26072) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-26 13:46:16 +02:00
Matt Jankowski
90f77d0112 Ignore long line in regex initializer (#26182) 2023-07-26 09:45:27 +02:00
Matt Jankowski
bada7a65aa
Ignore long line in regex initializer (#26182) 2023-07-26 09:45:27 +02:00
Eugen Rochko
1c28a202fe Remove 16:9 cropping from web UI (#26132) 2023-07-24 13:46:55 +02:00
Eugen Rochko
4d01d1a1ee
Remove 16:9 cropping from web UI (#26132) 2023-07-24 13:46:55 +02:00
mogaminsk
5cc1f7e73c Fix missing translation strings for importing lists (#26120) 2023-07-23 15:57:57 +02:00
mogaminsk
db310f383d
Fix missing translation strings for importing lists (#26120) 2023-07-23 15:57:57 +02:00
github-actions[bot]
d6e767559c New Crowdin translations (#2319) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-23 14:31:38 +02:00
github-actions[bot]
9ec43107f2
New Crowdin translations (#2319) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-23 14:31:38 +02:00
github-actions[bot]
9279c388c5 New Crowdin translations (#2317) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-22 09:53:26 +02:00
github-actions[bot]
9a45198ab0
New Crowdin translations (#2317) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-22 09:53:26 +02:00
Christian Schmidt
579e15fb7d Override default Action Mailer preview_path (#26110) 2023-07-21 21:12:57 +02:00
Christian Schmidt
296ec6cf57
Override default Action Mailer preview_path (#26110) 2023-07-21 21:12:57 +02:00
gunchleoc
257fadcec4 Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02:00
gunchleoc
217ef7f2af
Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02:00
Claire
5664c5370f Fix CSP headers being unintendedly wide (#26105) 2023-07-21 13:34:15 +02:00
Claire
e5f1000ad1
Fix CSP headers being unintendedly wide (#26105) 2023-07-21 13:34:15 +02:00
Claire
c5b79558e2 Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (#26023) 2023-07-21 13:17:43 +02:00
Claire
934c7b33d1
Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (#26023) 2023-07-21 13:17:43 +02:00
Renaud Chaput
f31a9bd78e Fix the crossorigin attribute (#26096) 2023-07-21 11:14:26 +02:00
Renaud Chaput
42698b4c5c
Fix the crossorigin attribute (#26096) 2023-07-21 11:14:26 +02:00
github-actions[bot]
356f2fc4c5 New Crowdin translations (#2314) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-21 09:26:08 +02:00
github-actions[bot]
e7cb6c6c44
New Crowdin translations (#2314) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-21 09:26:08 +02:00
gunchleoc
31dc72c828 Change casing for 'Server Settings' string (#26011) 2023-07-20 15:17:40 +02:00
gunchleoc
cabe1ea560
Change casing for 'Server Settings' string (#26011) 2023-07-20 15:17:40 +02:00
Misty De Méo
9e19cfdb05 Paperclip: add support for Azure blob storage (#23607) 2023-07-19 09:02:49 +02:00
Misty De Méo
b848ba3867
Paperclip: add support for Azure blob storage (#23607) 2023-07-19 09:02:49 +02:00
Matt Jankowski
4be315f0ae Cleanup unused portions of statuses/status partial (#26045) 2023-07-19 08:44:16 +02:00
Matt Jankowski
6edd404482
Cleanup unused portions of statuses/status partial (#26045) 2023-07-19 08:44:16 +02:00
github-actions[bot]
b3bc0e93e1 New Crowdin translations (#2310) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-19 08:39:14 +02:00
github-actions[bot]
2649fbce04
New Crowdin translations (#2310) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-07-19 08:39:14 +02:00
Claire
d315c684e4 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
 2023-07-19 07:35:51 +02:00
Claire
0092fe50ac Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
 2023-07-19 07:35:51 +02:00
Claire
4c50463116 New Crowdin updates (#2306) 
* New translations en.json (French)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.json (Afrikaans)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.json (Irish)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Georgian)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.json (Lithuanian)
[ci skip]

* New translations en.json (Macedonian)
[ci skip]

* New translations en.json (Punjabi)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Spanish, Mexico)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Croatian)
[ci skip]

* New translations en.json (Kazakh)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations en.json (English, United Kingdom)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.json (Uyghur)
[ci skip]

* New translations en.json (Tatar)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Latin)
[ci skip]

* New translations en.json (Bosnian)
[ci skip]

* New translations en.json (French, Quebec)
[ci skip]

* New translations en.json (Cornish)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.json (Igbo)
[ci skip]

* New translations en.json (Sardinian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Czech)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (French, Quebec)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]
 2023-07-19 07:05:33 +02:00
Claire
111686c38b
New Crowdin updates (#2306) 
* New translations en.json (French)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.json (Afrikaans)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.json (Irish)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Georgian)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.json (Lithuanian)
[ci skip]

* New translations en.json (Macedonian)
[ci skip]

* New translations en.json (Punjabi)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Spanish, Mexico)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Croatian)
[ci skip]

* New translations en.json (Kazakh)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations en.json (English, United Kingdom)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.json (Uyghur)
[ci skip]

* New translations en.json (Tatar)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Latin)
[ci skip]

* New translations en.json (Bosnian)
[ci skip]

* New translations en.json (French, Quebec)
[ci skip]

* New translations en.json (Cornish)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.json (Igbo)
[ci skip]

* New translations en.json (Sardinian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Czech)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (French, Quebec)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]
 2023-07-19 07:05:33 +02:00
github-actions[bot]
33a41a214a New Crowdin Translations (automated) (#26054) 
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-18 21:13:25 +02:00
github-actions[bot]
47832a1ac0
New Crowdin Translations (automated) (#26054) 
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-18 21:13:25 +02:00
Claire
0ef1efbe71 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
Claire
c943f17b1b Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
Eugen Rochko
45a7291d2c Fix not actually connecting to the configured replica (#25977) 2023-07-17 08:26:52 +02:00
Eugen Rochko
26e522ac55
Fix not actually connecting to the configured replica (#25977) 2023-07-17 08:26:52 +02:00
Claire
efa6d4416c Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
Claire
d9adda1a99 Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream 2023-07-13 22:40:15 +02:00
Stanislas Signoud
663e9484e2 Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
Stanislas Signoud
5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
Claire
618eb10d18 Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
Claire
41f65edb21
Fix embed dropdown menu item for unauthenticated users (#25964) 2023-07-13 15:53:03 +02:00
Matt Jankowski
ecf7aa0fb3 Refactor Status.tagged_with_all for brakeman SQL injection warning (#25941) 2023-07-13 15:52:37 +02:00
Matt Jankowski
644c5fddd8
Refactor Status.tagged_with_all for brakeman SQL injection warning (#25941) 2023-07-13 15:52:37 +02:00
Claire
c6212d89f8 Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.
 2023-07-13 13:35:15 +02:00
Claire
2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.
 2023-07-13 13:35:15 +02:00
Matt Jankowski
5cdc196e44 Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
Matt Jankowski
ce43ed144c
Rails 7.0 update (#25668) 2023-07-13 09:36:07 +02:00
Claire
1399e9d863 Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream 
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
 2023-07-12 16:03:05 +02:00
Claire
9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
 2023-07-12 16:03:05 +02:00
Claire
9af6f6db1a Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
 2023-07-12 15:54:58 +02:00
Claire
2aadebc769 Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
 2023-07-12 15:54:58 +02:00
Claire
2189682f8f Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream 2023-07-12 15:44:33 +02:00
Claire
075887e1d6 Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream 2023-07-12 15:44:33 +02:00
Claire
54b6b035a7 Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes.
 2023-07-12 15:38:35 +02:00
Claire
dd0002e1fe Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes.
 2023-07-12 15:38:35 +02:00
Claire
63ca7222d6 Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
 2023-07-12 15:27:32 +02:00
Claire
82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
 2023-07-12 15:27:32 +02:00
Claire
8a27e68050 Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream 2023-07-12 15:00:41 +02:00
Claire
7e54a30f06 Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream 2023-07-12 15:00:41 +02:00
Matt Jankowski
1b1ecf8ee2 Refactor Trends::Query to avoid brakeman sql injection warnings (#25881) 2023-07-12 14:19:20 +02:00
Matt Jankowski
1ef014802b
Refactor Trends::Query to avoid brakeman sql injection warnings (#25881) 2023-07-12 14:19:20 +02:00
Matt Jankowski
034a6a0dd4 Refactor Snowflake to avoid brakeman sql injection warnings (#25879) 2023-07-12 10:44:58 +02:00
Matt Jankowski
f831452037
Refactor Snowflake to avoid brakeman sql injection warnings (#25879) 2023-07-12 10:44:58 +02:00
Matt Jankowski
08421e7b90 Fix Naming/MemoizedInstanceVariableName cop (#25928) 2023-07-12 10:08:51 +02:00
Matt Jankowski
2e1391fdd2
Fix Naming/MemoizedInstanceVariableName cop (#25928) 2023-07-12 10:08:51 +02:00
Matt Jankowski
4932925530 Fix Lint/SendWithMixinArgument cop (#25920) 2023-07-12 10:02:32 +02:00
Matt Jankowski
b786911c55
Fix Lint/SendWithMixinArgument cop (#25920) 2023-07-12 10:02:32 +02:00
Nick Schonning
96a8aa32ad Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
Nick Schonning
1d557305d2
Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
Claire
086ddcb021 Update brakeman ignores (#25912) 2023-07-11 17:08:37 +02:00
Claire
9411fa4d36
Update brakeman ignores (#25912) 2023-07-11 17:08:37 +02:00
Nick Schonning
639c066a09 Run brakeman in GitHub Actions (#23713) 2023-07-11 15:23:57 +02:00
Nick Schonning
e11032585b
Run brakeman in GitHub Actions (#23713) 2023-07-11 15:23:57 +02:00
Claire
2b174c0d78 Fix moderation interface for remote instances with a .zip TLD (#25885) 2023-07-10 18:42:10 +02:00
Claire
4b5851974c
Fix moderation interface for remote instances with a .zip TLD (#25885) 2023-07-10 18:42:10 +02:00
Matt Jankowski
6555c33503 Admin mailer parameterization (#25759) 2023-07-08 20:03:38 +02:00
Matt Jankowski
cf33028f35
Admin mailer parameterization (#25759) 2023-07-08 20:03:38 +02:00
Kurtis Rainbolt-Greene
a27f2686ca First pass at multi-database for read replica using Rails native adapter (#25693) 
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
 2023-07-08 19:45:36 +02:00
Kurtis Rainbolt-Greene
e4cfe4b3db
First pass at multi-database for read replica using Rails native adapter (#25693) 
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
 2023-07-08 19:45:36 +02:00
Matt Jankowski
3f04f0c37b Regenerate brakeman ignore, pruning warnings (#25749) 2023-07-08 11:07:19 +02:00
Matt Jankowski
0f9b803eb3
Regenerate brakeman ignore, pruning warnings (#25749) 2023-07-08 11:07:19 +02:00
Kouhai
234f7cc84e th: Merge remote-tracking branch 'glitch/main' 
fixes: CVE-2023-36459
fixes: CVE-2023-36460
fixes: CVE-2023-36461
fixes: CVE-2023-36462
fixes: GHSA-55j9-c3mp-6fcq
fixes: GHSA-9928-3cp5-93fm
fixes: GHSA-9pxv-6qvf-pjwc
fixes: GHSA-ccm4-vgcc-73hp
 2023-07-06 12:12:21 -07:00
Claire
3581e4be49 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
Claire
ff7aae3037 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
Claire
3445bdfa45 Merge pull request from GHSA-9928-3cp5-93fm 
* Fix attachments getting processed despite failing content-type validation

* Add a restrictive ImageMagick security policy tailored for Mastodon

* Fix misdetection of MP3 files with large cover art

* Reject unprocessable audio/video files instead of keeping them unchanged
 2023-07-06 15:05:05 +02:00
Claire
dc8f1fbd97
Merge pull request from GHSA-9928-3cp5-93fm 
* Fix attachments getting processed despite failing content-type validation

* Add a restrictive ImageMagick security policy tailored for Mastodon

* Fix misdetection of MP3 files with large cover art

* Reject unprocessable audio/video files instead of keeping them unchanged
 2023-07-06 15:05:05 +02:00
Claire
784f2f35bc Merge branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +02:00
Claire
5de49e74d4 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +02:00
Kouhai
fa0f31a8fb th: merge glitch again (lol) 2023-07-05 01:14:10 -07:00
Eugen Rochko
80fee1403f Change labels of live feeds tabs in web UI (#25683) 2023-07-03 22:57:18 +02:00
Eugen Rochko
54a10523e2
Change labels of live feeds tabs in web UI (#25683) 2023-07-03 22:57:18 +02:00
Claire
0a6bc158bd Merge branch 'main' into glitch-soc/merge-upstream 2023-07-02 11:49:08 +02:00
Claire
44e98a2740 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-02 11:49:08 +02:00
Eugen Rochko
edb6aab974 Revert "Rails 7 update" (#25667) 2023-07-02 11:14:22 +02:00
Eugen Rochko
ba06a2f104
Revert "Rails 7 update" (#25667) 2023-07-02 11:14:22 +02:00
Matt Jankowski
5cadbaa296 Rails 7 update (#24241) 2023-07-02 10:38:53 +02:00
Matt Jankowski
50c2a03695
Rails 7 update (#24241) 2023-07-02 10:38:53 +02:00
Matt Jankowski
c1f496d2fb Remove unused routes (#25578) 2023-07-01 21:48:53 +02:00
Matt Jankowski
f8bd581126
Remove unused routes (#25578) 2023-07-01 21:48:53 +02:00
Claire
b7af3115a7 Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
 2023-06-25 14:27:38 +02:00
Claire
178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
 2023-06-25 14:27:38 +02:00
Claire
3406cb0427 Add POST /api/v1/conversations/:id/unread (#25509) 2023-06-22 18:46:43 +02:00
Claire
1d622c8033
Add POST /api/v1/conversations/:id/unread (#25509) 2023-06-22 18:46:43 +02:00
Matt Jankowski
acc8d8bf8e Use default bootsnap/setup in boot.rb (#25502) 2023-06-22 18:46:32 +02:00
Matt Jankowski
c9cd634184
Use default bootsnap/setup in boot.rb (#25502) 2023-06-22 18:46:32 +02:00
Claire
c1c87fe7b9 Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00
Claire
602c458ab6
Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00
Claire
7066e3d5ce Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
 2023-06-18 13:41:33 +02:00
Claire
6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
 2023-06-18 13:41:33 +02:00
Claire
f101b67a45 Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00