renovate[bot]
f923eeb9b8
Update dependency sass to v1.69.6 ( #28517 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
9 months ago
Santiago Kozak
1cba91d6d1
Fix reply icon display in picture-in-picture footer ( #28519 )
9 months ago
Renaud Chaput
fb5eb1f655
Replace our custom `compression-webpack-plugin` patch with the fixed upstream version ( #28510 )
9 months ago
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
9 months ago
Claire
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
9 months ago
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
9 months ago
Claire
a2624ff739
Convert signature verification specs to request specs ( #28443 )
9 months ago
Claire
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
9 months ago
Claire
72ff0d30d8
Fix submitting post from content warning field not working properly ( #2538 )
9 months ago
Claire
e676b57831
Merge pull request #2537 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to b7bdcd4f39
9 months ago
Matt Jankowski
bb8077e784
Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy ( #28470 )
9 months ago
Claire
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
9 months ago
Matt Jankowski
a4d49c236d
Fix `RSpec/LetSetup` cop in ap/fetch_featured_collection_service ( #28461 )
9 months ago
Claire
f96e713522
Fix trying to push mastodon-streaming docker images to upstream's ghcr repo ( #2541 )
9 months ago
Claire
5bd61a3fc5
Don't try to push images to Mastodon's dockerhub ( #2540 )
9 months ago
Matt Jankowski
e6e217fedd
Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup` cop ( #28462 )
9 months ago
Matt Jankowski
513d35969e
Fix `RSpec/LetSetup` cop in auth controller specs ( #28464 )
9 months ago
github-actions[bot]
e70a65761a
New Crowdin Translations (automated) ( #28467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
9 months ago
Claire
d4c87ff5b8
Disable use of missing native arm64 docker builder for the streaming image ( #2539 )
9 months ago
renovate[bot]
43547cd210
Update dependency debug to v1.9.1 ( #28466 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
9 months ago
Renaud Chaput
1c041356a1
Fix error on viewing a profile when unlogged ( #28465 )
9 months ago
Claire
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
9 months ago
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.
9 months ago
Claire
f2eb5038a6
Fix linting warning in glitch-soc-only migration
9 months ago
Claire
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
9 months ago
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>
9 months ago
Claire
a60b9acf3c
Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream
9 months ago
Claire
dac2b56932
Merge pull request #2535 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 4a7395d989
9 months ago
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.
9 months ago
Claire
d668b85dcd
Merge pull request #2532 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 0b4a3a0437
9 months ago
Matt Jankowski
9251779d75
Fix `RSpec/LetSetup` cop in spec/services ( #28459 )
9 months ago
Matt Jankowski
efd16f3c2c
Clean up of `RSpec/LetSetup` within `spec/services/activitypub` ( #28445 )
9 months ago
Matt Jankowski
c99f88e1a8
Clean up of `RSpec/LetSetup` within `spec/lib` ( #28447 )
9 months ago
Matt Jankowski
cd64a5b2ec
Clean up of `RSpec/LetSetup` within `api/` ( #28448 )
9 months ago
Eugen Rochko
5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI ( #28452 )
9 months ago
Matt Jankowski
f32d672d2f
Clean up of `RSpec/LetSetup` within `spec/controllers` ( #28446 )
9 months ago
Matt Jankowski
c753b1ad35
Clean up of `RSpec/LetSetup` within `spec/models` ( #28444 )
9 months ago
renovate[bot]
87e2bd02ac
Update dependency irb to v1.11.0 ( #28442 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
9 months ago
github-actions[bot]
9e5ddc1745
New Crowdin Translations (automated) ( #28451 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
9 months ago
Matt Jankowski
2463b53363
More duplicates in cli maintenance spec, misc bug fixes ( #28449 )
9 months ago
Eugen Rochko
01f0a6ca4f
Fix profile setup showing default avatar in web UI ( #28453 )
9 months ago
Claire
9ac13bbc9c
Fix glitch-only HAML linting issue
9 months ago
Claire
b2961dad2b
Fix lint issue in glitch-soc-only file
9 months ago
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>
9 months ago
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.
9 months ago
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.
9 months ago
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>
9 months ago
Claire
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
9 months ago
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>
9 months ago
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.
9 months ago