treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
39,647 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

39647 Commits (e9dbe3177696bcb287e6e6456ca460f9124b86fa)

Author SHA1 Message Date
renovate[bot] de3fa293b0
Update dependency fastimage to v2.3.0 (#28488) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-12-29 10:16:26 +00:00
renovate[bot] 07ab97d7f9
Update dependency rubocop-rails to v2.23.1 (#28493) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-12-29 10:16:00 +00:00
renovate[bot] 87e9e87a14
Update eslint (non-major) (#28494) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-12-29 10:15:43 +00:00
Christian Winther 01df9f1abb
install "wget" in streaming Dockerfile (#28497) 2023-12-29 10:15:10 +00:00
renovate[bot] 3f0140bbdf
Update dependency webauthn to v3.1.0 (#28507) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-12-29 10:13:29 +00:00
renovate[bot] 851a9b80c8
Update dependency react-redux-loading-bar to v5.0.7 (#28511) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-12-29 10:12:13 +00:00
renovate[bot] fb58397a33
Update dependency axios to v1.6.3 (#28509) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-12-29 10:11:40 +00:00
renovate[bot] f923eeb9b8
Update dependency sass to v1.69.6 (#28517) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-12-29 10:11:02 +00:00
Santiago Kozak 1cba91d6d1
Fix reply icon display in picture-in-picture footer (#28519) 2023-12-29 09:48:27 +00:00
Renaud Chaput fb5eb1f655
Replace our custom `compression-webpack-plugin` patch with the fixed upstream version (#28510) 2023-12-29 09:33:06 +00:00
Claire c5b0e6d5a0 Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
Claire 19e14654cc
Reduce CSP configuration changes with upstream (#2536) 2023-12-27 09:54:05 +01:00
Claire 7b7b6d234b
Change mastodon-streaming nightly builds to be tagged as latest (#2546) 
glitch-soc does not have releases, so it tags nightly container builds as latest; but we were not doing the same thing for the new `mastodon-streaming` container
 2023-12-26 12:13:56 +01:00
Claire a2624ff739
Convert signature verification specs to request specs (#28443) 2023-12-22 18:56:22 +00:00
Claire ea6c187fca Fix media attachment order of remote posts (#28469) 2023-12-22 18:45:36 +01:00
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