mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,419 Commits
69 Branches
21 Tags
341 MiB
Commit Graph

20419 Commits (2f521bc84ae1dce8fd1cfeabaa17deb3eeb272a4)

Author SHA1 Message Date
Claire 72ff0d30d8
Fix submitting post from content warning field not working properly (#2538) 2023-12-22 17:23:15 +01:00
Claire e676b57831
Merge pull request #2537 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to b7bdcd4f39
 2023-12-22 17:22:39 +01:00
Matt Jankowski bb8077e784
Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy (#28470) 2023-12-22 15:29:50 +00:00
Claire 2bf84b93d4
Fix media attachment order of remote posts (#28469) 2023-12-22 15:10:39 +00:00
Matt Jankowski a4d49c236d
Fix `RSpec/LetSetup` cop in ap/fetch_featured_collection_service (#28461) 2023-12-22 12:57:29 +00:00
Claire f96e713522
Fix trying to push mastodon-streaming docker images to upstream's ghcr repo (#2541) 2023-12-22 13:01:08 +01:00
Claire 5bd61a3fc5
Don't try to push images to Mastodon's dockerhub (#2540) 2023-12-22 12:13:53 +01:00
Matt Jankowski e6e217fedd
Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop (#28462) 2023-12-22 08:32:27 +00:00
Matt Jankowski 513d35969e
Fix `RSpec/LetSetup` cop in auth controller specs (#28464) 2023-12-22 08:03:59 +00:00
github-actions[bot] e70a65761a
New Crowdin Translations (automated) (#28467) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-22 07:58:20 +00:00
Claire d4c87ff5b8
Disable use of missing native arm64 docker builder for the streaming image (#2539) 2023-12-22 08:45:37 +01:00
renovate[bot] 43547cd210
Update dependency debug to v1.9.1 (#28466) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-12-22 07:41:21 +00:00
Renaud Chaput 1c041356a1
Fix error on viewing a profile when unlogged (#28465) 2023-12-21 20:19:18 +00:00
Claire 92aa6e2ec9 Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream 2023-12-21 19:42:13 +01:00
Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
 2023-12-21 19:31:12 +01:00
Claire f2eb5038a6 Fix linting warning in glitch-soc-only migration 2023-12-21 19:25:12 +01:00
Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.
 2023-12-21 19:24:10 +01:00
Claire 7a0be26367 [Glitch] Fix empty column explainer getting cropped under certain conditions 
Port 3f1ec16377 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-21 19:08:43 +01:00
Claire a60b9acf3c Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream 2023-12-21 19:04:20 +01:00
Claire dac2b56932
Merge pull request #2535 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 4a7395d989
 2023-12-21 19:03:29 +01:00
Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file.
 2023-12-21 18:17:17 +01:00
Claire d668b85dcd
Merge pull request #2532 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0b4a3a0437
 2023-12-21 18:13:49 +01:00
Matt Jankowski 9251779d75
Fix `RSpec/LetSetup` cop in spec/services (#28459) 2023-12-21 14:23:53 +00:00
Matt Jankowski efd16f3c2c
Clean up of `RSpec/LetSetup` within `spec/services/activitypub` (#28445) 2023-12-21 11:20:12 +00:00
Matt Jankowski c99f88e1a8
Clean up of `RSpec/LetSetup` within `spec/lib` (#28447) 2023-12-21 11:19:56 +00:00
Matt Jankowski cd64a5b2ec
Clean up of `RSpec/LetSetup` within `api/` (#28448) 2023-12-21 10:10:18 +00:00
Eugen Rochko 5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452) 2023-12-21 09:44:09 +00:00
Matt Jankowski f32d672d2f
Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446) 2023-12-21 09:28:41 +00:00
Matt Jankowski c753b1ad35
Clean up of `RSpec/LetSetup` within `spec/models` (#28444) 2023-12-21 09:18:38 +00:00
renovate[bot] 87e2bd02ac
Update dependency irb to v1.11.0 (#28442) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-12-21 09:13:10 +00:00
github-actions[bot] 9e5ddc1745
New Crowdin Translations (automated) (#28451) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-21 09:09:00 +00:00
Matt Jankowski 2463b53363
More duplicates in cli maintenance spec, misc bug fixes (#28449) 2023-12-21 08:51:03 +00:00
Eugen Rochko 01f0a6ca4f
Fix profile setup showing default avatar in web UI (#28453) 2023-12-21 08:32:25 +00:00
Claire 9ac13bbc9c Fix glitch-only HAML linting issue 2023-12-20 22:27:29 +01:00
Claire b2961dad2b Fix lint issue in glitch-soc-only file 2023-12-20 22:25:23 +01:00
Matt Jankowski 01e77a0f34 [Glitch] Enable the eslint `react/no-unknown-property` rule 
Port ee83d5c760 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 22:24:40 +01:00
Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
 2023-12-20 22:16:50 +01:00
Claire 75580360cd Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
  `Metrics/AbcSize` cop.
  Glitch-soc has different code and slightly higher `AbcSize` complexity,
  modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
  Upstream changed `account.suspended?` to `account.unavailable?` to prepare
  for delete flags. Glitch-soc has additional local-only conditions.
  Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
  Upstream refactored a bunch of stuff while glitch-soc has more settings.
  Refactored as upstream did while keeping glitch-soc's settings.
 2023-12-20 22:05:31 +01:00
Claire 5de551002d [Glitch] Fix onboarding step descriptions being truncated on narrow screens 
Port b20af17a2c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 21:59:58 +01:00
Claire 8a5f2442cc Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream 2023-12-20 21:58:18 +01:00
Claire b41af99673 [Glitch] Change dismissed banners to be stored server-side 
Port 7faa27e17d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 20:40:47 +01:00
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
 2023-12-20 20:10:45 +01:00
Claire f425a1e637
Merge pull request #2519 from ClearlyClaire/glitch-soc/immutable-record-redux 
Use Immutable `Record` for accounts in Redux state
 2023-12-20 20:06:49 +01:00
Renaud Chaput a4a728b01d [Glitch] Fix the loading bar with the new Redux actions 
Port 8b1eeb2f90 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Claire 93c71e2c7c [Glitch] Fix notification sounds 
Port f3864db409 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Claire 70652e49eb [Glitch] Fix error when muting users from Web UI 
Port 32319187ee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Renaud Chaput e94fecdcc8 [Glitch] Fix the `notificationsUpdate` call 
Port f476d9dab2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Renaud Chaput 79678cf841 [Glitch] Fixes website not loading for unlogged users 
Port 6712bf86cd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Renaud Chaput 7fe5623a27 [Glitch] Use Immutable `Record` for accounts in Redux state 
Port 3bf2a7296e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Renaud Chaput 3b7caa00e2 [Glitch] Add Typescript types for some API objects 
Port 57f592fed5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00