sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity
20,340 commits 2 branches 0 tags 263 MiB
Commit graph

2,109 commits

Author SHA1 Message Date
Essem
bbf2dbaf56
 		Merge remote-tracking branch 'upstream/main' 2023-12-17 19:48:56 -06:00
hazycora
2dde7a25a4 allow dashes in emoji shortcodes 2023-12-17 17:42:15 -06:00
hazycora
2eab76cbcc allow side-by-side emoji 
(Let's see how this goes :woozycat:)
 2023-12-17 17:42:15 -06:00
Claire
1474318691 Merge commit 'a916251d8a' into glitch-soc/main 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream fixed a bug in the trending post condition.
  Glitch-soc's condition is different because we potentially allow CWed content
  to trend.
  Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
  Kept our version for now, we will switch to upstream later down the road.
 2023-12-17 15:32:29 +01:00
Essem
00dae881c5
 		Merge remote-tracking branch 'upstream/main' 2023-12-12 20:30:34 -06:00
Claire
9f92b05bd2 Merge commit '2e6bf60f15' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
 2023-12-10 18:05:02 +01:00
Essem
050212c35d
 		Fix reblog reactions 2023-11-10 17:37:22 -06:00
Essem
5222d41546
 		Add notification emails for reactions 2023-11-10 15:16:29 -06:00
Claire
6c52f8286b
 		Fix posts from force-sensitized accounts being able to trend (#27620) 2023-10-30 22:32:25 +00:00
Essem
0868c11651
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-30 14:42:53 -05:00
Claire
93e4cdc31b
 		Fix hashtag matching pattern matching some URLs (#27584) 2023-10-27 14:04:51 +00:00
Matt Jankowski
12550a6a28
 		Use Rails.env.local? shorthand method to check env (#27519) 2023-10-26 21:20:41 +00:00
Claire
4ef66d6538 Merge commit '15182d1e5e' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  glitch-soc had extra ignores.
  Removed them.
 2023-10-24 20:31:20 +02:00
Claire
4b0fb764c3 Merge commit 'e93a75f1a1' into glitch-soc/merge-upstream 
Conflicts and ported changes:
- updated `@rails/ujs` imports
 2023-10-24 19:59:19 +02:00
Claire
57c0de949b Merge commit '8b770ce811' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change.
 2023-10-24 19:17:20 +02:00
Claire
787d5ad386 Merge commit 'bcae744275' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Caused by a glitch-soc-only dependency (`exif-js`).
  Kept it.
 2023-10-24 19:05:18 +02:00
Claire
b0c76eaadd Merge commit '0ad66175bf' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
 2023-10-24 18:41:20 +02:00
Matt Jankowski
714e3ae5b5
 		Use Rails 7.1 normalizes feature (#27521) 2023-10-24 10:06:10 +00:00
Matt Jankowski
e93a75f1a1
 		Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
Claire
8b770ce811
 		Add warnings to report action logs (#27425) 2023-10-23 14:30:46 +02:00
Claire
bcae744275
 		Fix some link anchors being recognized as hashtags (#27271) 2023-10-23 14:19:38 +02:00
Matt Jankowski
b0213472df
 		Validate allowed schemes on preview card URLs (#27485) 2023-10-23 09:50:02 +02:00
Essem
c10194fc82
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-20 11:48:03 -05:00
Claire
74fd46d3ab Merge commit '9f218c9924' into glitch-soc/merge-upstream 2023-10-19 19:14:04 +02:00
Matt Jankowski
63a2a4b074
 		Fix Performance/DeletePrefix cop (#27448) 2023-10-18 10:32:09 +02:00
Claire
c10a667ac2 Merge commit '935d54124e' into glitch-soc/merge-upstream 2023-10-17 21:42:49 +02:00
Matt Jankowski
08a376cbcb
 		Fix Style/CombinableLoops cop (#27429) 2023-10-16 16:36:28 +02:00
Essem
29f2a7d9f4
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-10 12:24:32 -05:00
Claire
53f5b27bd1 Merge commit '640421f661' into glitch-soc/merge-upstream 2023-10-08 17:30:48 +02:00
Claire
ac2370778a Merge commit 'c676bc91e9' into glitch-soc/merge-upstream 
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
 2023-10-08 17:21:12 +02:00
Claire
d7fcd70023 Merge commit '2016c5d912' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
 2023-10-08 16:41:56 +02:00
Claire
19ebf7797e Merge commit 'e6b903b21e' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00
Essem
eef26a5066
 		Revert "Change score half-life for trending posts from 2 hours to 1 hour (#26915)" 
This reverts commit fc6825055b.
 2023-10-06 23:02:38 -05:00
Claire
340c390849
 		Fix crash when filtering for “dormant” relationships (#27306) 2023-10-06 12:58:16 +02:00
Matt Jankowski
c676bc91e9
 		Dont match mention in url query string (#25656) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-03 17:01:45 +02:00
Matt Jankowski
2016c5d912
 		Fix deprecation warning about rewhere: true being default behavior (Rails 7.1 prep) (#27190) 2023-09-28 16:52:23 +02:00
Matt Jankowski
3060bfa4bd
 		Extract filename and csv helper methods from Form::Import (#26129) 2023-09-28 16:22:05 +02:00
Claire
686406cc2d
 		Fix filtering audit log for entries about disabling 2FA (#27186) 2023-09-28 13:41:24 +02:00
Essem
8d776b9aa5
 		Merge remote-tracking branch 'upstream/main' 2023-09-26 20:03:35 -05:00
Claire
abdb58840a Merge commit '57f592fed5' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
Essem
bd810391d6
 		Properly remove tIME chunk from PNG uploads (#27111) 2023-09-25 19:21:07 +02:00
Claire
1bd7455d81
 		Fix inefficient queries in “Follows and followers” as well as several admin pages (#27116) 2023-09-25 15:06:43 +02:00
Essem
26c343df42
 		Properly remove tIME chunk from PNG uploads 2023-09-24 21:13:49 -05:00
Claire
39da3d86f8
 		Fix ActiveRecord using two connection pools when no replica is defined (#27061) 2023-09-22 16:01:59 +02:00
Essem
81c06b286f
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-09-16 11:27:11 -05:00
Claire
dfc05ec8df Merge commit '6273416292' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
 2023-09-15 21:43:49 +02:00
Claire
5ed72f668f Merge commit 'b90383d073' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
Claire
08b495d95c Merge commit 'b1d8907138' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire
5d8c65f2a7 Merge commit '398635c0c4' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
Claire
e4f5114aaf
 		Fix obsolete cache key in status cache invalidation logic (#26934) 2023-09-15 19:52:28 +02:00