djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-13 22:23:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
24,414 Commits 70 Branches 22 Tags 367 MiB
Commit Graph

24414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GitHub Actions
93d38660df New Crowdin translations 2025-02-10 04:34:15 +00:00
Claire
6d14a36cdc
Merge pull request #2967 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1cf30717dbe7a0038a645c62f19deef7efc42207
 2025-02-08 20:29:37 +01:00
Claire
a417d6f3fc Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/precompute_feed_service.rb`:
  Upstream added an option to skip half-generated timelines.
  We have a conflict because we still maintain upstream's old chronological DM
  timelines.
  Update our code to apply the same logic to the DM timelines.
 2025-02-07 21:21:28 +01:00
Claire
1cf30717db
Fix potential inefficiency in media privacy system check (#33858) 2025-02-07 10:22:59 +00:00
renovate[bot]
38a3e8d0e3
chore(deps): update dependency webauthn to v3.3.0 (#33857) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-07 09:11:01 +00:00
github-actions[bot]
b7bc7cd087
New Crowdin Translations (automated) (#33856) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-07 08:51:09 +00:00
renovate[bot]
5ffc17415c
chore(deps): update dependency ruby-vips to v2.2.3 (#33853) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-07 08:48:43 +00:00
renovate[bot]
6d5e6a6818
chore(deps): update dependency rspec-rails to v7.1.1 (#33850) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-06 15:18:41 +00:00
renovate[bot]
d8f1881ab0
chore(deps): update dependency fog-core to v2.6.0 (#33775) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-06 15:18:20 +00:00
Matt Jankowski
23a0d91126
Combine examples to reduce factories in specs (#33841) 2025-02-06 10:54:31 +00:00
renovate[bot]
aff2b11394
chore(deps): update dependency fog-openstack to v1.1.4 (#33843) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-06 10:54:27 +00:00
renovate[bot]
9701c6f148
fix(deps): update dependency sass to v1.84.0 (#33845) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-06 10:54:22 +00:00
renovate[bot]
116f5826d3
chore(deps): update dependency webmock to v3.25.0 (#33848) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-06 10:54:15 +00:00
github-actions[bot]
9692ffb911
New Crowdin Translations (automated) (#33847) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-06 10:53:56 +00:00
Claire
9e164c532f
Add --skip-filled-timeline option to tootctl feed build to skip half-filled feeds (#33844) 2025-02-06 09:38:32 +00:00
Claire
9449e12137
Merge pull request #2966 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to a9643cb7e77fd345b48877ed958d406403ad1b46
 2025-02-05 19:42:23 +01:00
Claire
6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-releases.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-security.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
 2025-02-05 18:21:36 +01:00
Claire
a9643cb7e7
Use github's native arm64 runners for docker builds (#33788) 2025-02-05 15:58:28 +00:00
Claire
334d306ccc
Fix filtering for lists (#33842) 2025-02-05 15:08:12 +00:00
Claire
1be5269151
Optimize timeline generation (#33839) 2025-02-05 14:02:39 +00:00
Renaud Chaput
4af91e564d
Fix a missing require when enabling the local prometheus exporter with Sidekiq (#33840) 2025-02-05 13:49:47 +00:00
renovate[bot]
5cb54f7c5e
chore(deps): update dependency opentelemetry-instrumentation-redis to v0.26.1 (#33837) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-05 09:23:13 +00:00
Matt Jankowski
c3419d146a
Remove duplicate cache header setting before action (#33833) 2025-02-05 09:19:08 +00:00
renovate[bot]
8dce5138dd
chore(deps): update opentelemetry-ruby (non-major) (#33834) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-05 08:58:05 +00:00
github-actions[bot]
7dca242795
New Crowdin Translations (automated) (#33835) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-05 08:53:32 +00:00
Claire
579e7d98e1
Merge pull request #2965 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3b1ba46c93de63268d20104dee63374d0708deb0
 2025-02-04 22:39:26 +01:00
Claire
c59f879f30 [Glitch] Fix emoji rewrite adding unnecessary curft to the DOM for most emoji 
Port 44f5f1f0a56b0da1a7f333b641d0b1c6474860be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-04 18:41:09 +01:00
Claire
1dbeac2196 Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream 2025-02-04 18:38:41 +01:00
Matt Jankowski
3b1ba46c93
Use require: false on CLI/console tool gems in Gemfile (#33830) 2025-02-04 16:08:27 +00:00
Matt Jankowski
745391092c
Configure webpacker cache_manifest: true in non-dev environments (#33832) 2025-02-04 15:55:10 +00:00
Matt Jankowski
95caa8bc4e
Switch coverage generation default to false, allow opt in with COVERAGE env var (#33824) 2025-02-04 11:14:45 +00:00
Claire
5212cd43ec
Change preview cards to be shown when Content Warnings are expanded (#33827) 2025-02-04 10:40:43 +00:00
github-actions[bot]
c3e80784ee
New Crowdin Translations (automated) (#33825) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-04 09:39:07 +00:00
Claire
5553941666
Drop custom scopes conversion code from /settings/applications controller (#33819) 2025-02-04 09:31:42 +00:00
renovate[bot]
bc0fb83ce5
chore(deps): update dependency rubocop to v1.71.2 (#33826) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-04 09:25:06 +00:00
Claire
44f5f1f0a5
Fix emoji rewrite adding unnecessary curft to the DOM for most emoji (#33818) 2025-02-03 13:43:45 +00:00
Claire
b1c9cff71b
Add language column to public timelines index (#33779) 2025-02-03 13:41:44 +00:00
github-actions[bot]
a85a9f98d9
New Crowdin Translations (automated) (#33802) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-03 08:40:09 +00:00
Matt Jankowski
107b2afb74
Revert selenium-webdriver version bump (#33797) 2025-02-03 07:49:31 +00:00
renovate[bot]
4b6c955e5b
chore(deps): update dependency strong_migrations to v2.2.0 (#33808) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-03 07:49:05 +00:00
renovate[bot]
cefa829c1d
chore(deps): update dependency typescript to v5.7.3 (#33814) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-03 07:48:45 +00:00
renovate[bot]
7481d94bb6
chore(deps): update definitelytyped types (non-major) (#33813) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-03 07:48:35 +00:00
Claire
cf820b2eca
Fix /settings/applications rejecting scopes parameter (#33798) 2025-02-02 21:11:32 +00:00
Claire
29e0edbfff
Merge pull request #2962 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to f79b96a5ef0f6c4f57eee7f44ce2579b28a22098
 2025-02-02 18:12:29 +01:00
Eugen Rochko
a3399ed560 [Glitch] Add reminder when about to post without alt text in web UI 
Port 1e70da5e3c279c8e632abb6bdf90b1ddc67b035e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-01 19:58:11 +01:00
Eugen Rochko
800bea7209 [Glitch] Add ability to dismiss alt text badge by tapping it in web UI 
Port 796187c1e8a387d94892e39cc8b897866e616d4d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-02-01 19:10:32 +01:00
Claire
c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
 2025-02-01 19:07:13 +01:00
renovate[bot]
f79b96a5ef
chore(deps): update dependency rubocop to v1.71.1 (#33796) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-31 14:52:27 +00:00
renovate[bot]
a29fc4b44a
chore(deps): update dependency puma to v6.6.0 (#33768) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-31 14:14:07 +00:00
Matt Jankowski
77587913ce
Convert admin/reports spec controller->system (#33789) 2025-01-31 08:15:51 +00:00