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

2,444 commits

Author SHA1 Message Date
Essem
bbf2dbaf56
 		Merge remote-tracking branch 'upstream/main' 2023-12-17 19:48:56 -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
ddf3ad9541 Merge commit '3bf896c973' into glitch-soc/main 
Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency.
 2023-12-17 17:43:30 +01: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
6aafe6c541
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-11-27 10:22:34 -06:00
Claire
660372d130
 		Revert recent CSP changes (#2485) 
* Revert "Fix image and media loading when using external storage server"

This reverts commit 6cfa0245ca.

* Revert "Change glitch-soc's CSP config to match upstream's closer (#2474)"

This reverts commit d59196e170.
 2023-11-26 15:32:35 +01:00
Essem
6dd12b9cd2
 		Merge remote-tracking branch 'upstream/main' 2023-11-21 19:38:13 -06:00
Claire
6cfa0245ca Fix image and media loading when using external storage server 
Fixes #2479
 2023-11-21 13:45:29 +01:00
Claire
d59196e170
 		Change glitch-soc's CSP config to match upstream's closer (#2474) 2023-11-20 13:02:49 +01:00
Claire
c0989b78f8
 		Fix incoming status creation date not being restricted to standard ISO8601 (#27655) 2023-11-06 09:28:14 +00:00
Renaud Chaput
6712bf86cd
 		Fixes website not loading for unlogged users (#27698) 2023-11-04 21:52:56 +00:00
Claire
0337df3a42
 		Fix posts from threads received out-of-order sometimes not being inserted into timelines (#27653) 2023-11-02 14:58:37 +00:00
Claire
d649bbf28f
 		Add some more tests and clean up domain block controller (#27469) 2023-10-31 09:40:30 +00:00
Matt Jankowski
beee9ea991
 		Fix RSpec/LetSetup cop in spec/controllers/admin area (#27619) 2023-10-31 08:22:19 +00:00
Essem
0868c11651
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-30 14:42:53 -05:00
Matt Jankowski
eae5c7334a
 		Extract class from CSP configuration/initialization (#26905) 2023-10-27 16:20:40 +00:00
Matt Jankowski
2e6bf60f15
 		Use deliveries.size in mailer-related examples in controller specs (#27589) 2023-10-27 15:33:52 +00:00
Claire
93e4cdc31b
 		Fix hashtag matching pattern matching some URLs (#27584) 2023-10-27 14:04:51 +00:00
Matt Jankowski
1f5187e2e2
 		Misc spec/refactor to user mailer and user mailer spec (#27486) 2023-10-27 09:57:16 +00:00
Claire
bbf46cc418
 		Fix error and incorrect URLs in /api/v1/accounts/:id/featured_tags for remote accounts (#27459) 2023-10-27 08:35:21 +00:00
Jeong Arm
8f998cd96a
 		Handle featured collections without items (#27581) 2023-10-27 02:36:22 +00:00
Claire
49b8433c56
 		Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368) 2023-10-25 21:33:44 +00: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
e25cc4deb7 Merge commit '379115e601' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
 2023-10-24 19:31:14 +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
e93a75f1a1
 		Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
Daniel M Brasil
26d2a2a0cc
 		Migrate to request specs in /api/v1/media (#25543) 2023-10-23 15:46:21 +00: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
Matt Jankowski
ab0fb81479
 		Configure brakeman to ignore url safe preview card urls (#25883) 2023-10-20 15:32:16 +02:00
Claire
13688539bc
 		Fix processing LDSigned activities from actors with unknown public keys (#27474) 2023-10-20 10:45:46 +02:00
Claire
74fd46d3ab Merge commit '9f218c9924' into glitch-soc/merge-upstream 2023-10-19 19:14:04 +02:00
Matt Jankowski
9f218c9924
 		Refactor appeal partial to avoid brakeman XSS warning (#25880) 2023-10-19 17:25:54 +02:00
Matt Jankowski
bcd0171e5e
 		Fix Lint/UselessAssignment cop (#27472) 2023-10-19 16:55:06 +02:00
Daniel M Brasil
7bc8f03162
 		Add test coverage for Mastodon::CLI::Accounts#migrate (#25284) 2023-10-19 16:11:15 +02:00
Matt Jankowski
a1b27d8b61
 		Fix Naming/VariableNumber cop (#27447) 2023-10-18 14:26:22 +02:00
Emelia Smith
7c3fea7275
 		Feature: Allow token introspection without read scope (#27142) 2023-10-18 14:10:07 +02:00
Daniel M Brasil
091a21e1bc
 		Add test coverage for Mastodon::CLI::Accounts#prune (#25204) 2023-10-18 10:20:50 +02:00
Claire
e9dc30cdba
 		Fix duplicate github annotations for rspec failures (#27450) 2023-10-18 10:18:34 +02:00
Claire
63179f0bf4 Merge commit '5ef26d8fd5' into glitch-soc/merge-upstream 2023-10-17 21:59:58 +02:00
Claire
c10a667ac2 Merge commit '935d54124e' into glitch-soc/merge-upstream 2023-10-17 21:42:49 +02:00
Claire
b867d4581e Merge commit 'c91c0175db' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.

Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`.
 2023-10-17 21:35:07 +02:00
Claire
656a41db2a Merge commit '77098c6f1c' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
 2023-10-17 20:59:18 +02:00
Nick Schonning
5ef26d8fd5
 		Add RSpec GitHub annotations gem (#24040) 2023-10-17 18:28:09 +02:00
Matt Jankowski
71447ab19f
 		Fix Capybara/ClickLinkOrButtonStyle cop in spec/features/admin area (#27445) 2023-10-17 16:57:19 +02:00
Matt Jankowski
2528a0721f
 		Update rubocop-capybara to version 2.19.0 (#26982) 2023-10-17 16:10:50 +02:00