Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream changes up to 75ecc6df068ec2c21b26f05692eb5dfdc35671fa #2910

Merged
Merged
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
9ebed5d
Fix CSS warnings (#32266)
c960657 Nov 22, 2024
0ad5c21
Fix accounts table long display name (#29316)
WebCoder49 Nov 22, 2024
35683ac
Remove webauthn credentials on `tootctl accounts modify --disable-2fa…
mszpro Nov 22, 2024
9d34146
Remove redundant temporary index creation in `tootctl status remove` …
ClearlyClaire Nov 22, 2024
04ce593
Prevent delivery of new posts to suspended followers (#27509)
ClearlyClaire Nov 22, 2024
99f36f1
Tweak antispam a bit (#33024)
ClearlyClaire Nov 22, 2024
2e66dd0
Show default time zone (#31803)
c960657 Nov 22, 2024
21a8612
Prevent delivery of posts to (even more) suspended followers (#33030)
oneiros Nov 22, 2024
27e79da
Update immutable imports for v5 (#33037)
nschonni Nov 22, 2024
91cc180
Update dependency puma to v6.5.0 (#33041)
renovate[bot] Nov 23, 2024
8c322cc
Update dependency mutex_m to v0.3.0 (#32991)
renovate[bot] Nov 23, 2024
a20dca7
Restore stdout logging setting in development environment (#33057)
mjankowski Nov 24, 2024
1333ed4
Update docker/dockerfile Docker tag to v1.11 (#33060)
renovate[bot] Nov 25, 2024
4521390
New Crowdin Translations (automated) (#33043)
github-actions[bot] Nov 25, 2024
7fb0880
Update dependency husky to v9.1.7 (#33058)
renovate[bot] Nov 25, 2024
fd90f04
Add coverage for `UserRole` validations (#33029)
mjankowski Nov 25, 2024
ab9c62e
Add coverage for `User` validations (#33028)
mjankowski Nov 25, 2024
74df47a
Add coverage for `Webhook` validations (#33026)
mjankowski Nov 25, 2024
1be83c6
Fix username and display name being hidden on narrow screens in moder…
ClearlyClaire Nov 25, 2024
1a88c05
Fix arrow in the wrong place on empty list members screen in web UI (…
Gargron Nov 25, 2024
2d8fed2
Fix `TagFollow` records not being correctly handled in account operat…
ClearlyClaire Nov 25, 2024
9a7130d
Fix direct inbox delivery pushing posts into inactive followers' time…
ClearlyClaire Nov 25, 2024
6d62581
Update ✨binstub✨ templates (#32335)
mjankowski Nov 25, 2024
0ea9d81
Remove `body_class_string` helper (#33072)
mjankowski Nov 26, 2024
3e901d1
Update dependency selenium-webdriver to v4.27.0 (#33071)
renovate[bot] Nov 26, 2024
36496f4
Update Yarn to v4.5.3 (#33069)
renovate[bot] Nov 26, 2024
6b1dd1b
New Crowdin Translations (automated) (#33074)
github-actions[bot] Nov 26, 2024
72f623c
Update dependency @dnd-kit/sortable to v9 (#33051)
renovate[bot] Nov 26, 2024
b702cd7
Update dependency @dnd-kit/core to v6.2.0 (#33050)
renovate[bot] Nov 26, 2024
6efa320
Fix `Style/SafeNavigation` cop (#32970)
mjankowski Nov 26, 2024
0891451
Update dependency postcss-preset-env to v10.1.1 (#32947)
renovate[bot] Nov 26, 2024
7ba19ec
Update dependency webauthn to v3.2.2 (#32879)
renovate[bot] Nov 26, 2024
5c3a64d
Update dependency aws-sdk-s3 to v1.174.0 (#33076)
renovate[bot] Nov 26, 2024
f0855fd
Update dependency axios to v1.7.8 (#33075)
renovate[bot] Nov 26, 2024
a27bafa
Add `UserRole#bypass_block?` method for notification check (#32974)
mjankowski Nov 26, 2024
429e08e
Remove old notifications route from web UI (#33038)
Gargron Nov 26, 2024
7a3dea3
Change onboarding flow in web UI (#32998)
Gargron Nov 26, 2024
46c43d2
Change avatar and header size limits from 2MB to 8MB when using libvi…
Gargron Nov 26, 2024
e4bd316
Update opentelemetry-ruby (non-major) (#33083)
renovate[bot] Nov 28, 2024
fa3577e
New Crowdin Translations (automated) (#33084)
github-actions[bot] Nov 28, 2024
48f3ed7
Fix list error messages (#33082)
Gargron Nov 28, 2024
7f4858b
Correctly sanitize MathML out of post content (#27107)
4e554c4c Nov 28, 2024
7a4370f
Fix inactive users' timelines being backfilled on follow and unsuspen…
ClearlyClaire Nov 28, 2024
eef8d2c
Add link from Web UI for Hashtags to the Moderation UI (#31448)
ThisIsMissEm Nov 29, 2024
7f2cfcc
Change design of modal loading and error screens in web UI (#33092)
Gargron Nov 29, 2024
9296d58
New Crowdin Translations (automated) (#33104)
github-actions[bot] Nov 29, 2024
9ff0140
Fix middle-click handling conflicting with automatic scrolling (#33106)
ClearlyClaire Nov 29, 2024
c58967c
Add `tootctl feeds vacuum` (#33065)
ClearlyClaire Nov 29, 2024
4635ce2
Remove constant definition from global scope in embed.js (#33107)
YKWeyer Nov 29, 2024
986a367
Change server rules to be collapsible (#33039)
Gargron Nov 29, 2024
4de108e
Change "social web" to "fediverse" in a few banners in web UI (#33101)
Gargron Nov 29, 2024
75ecc6d
Fix typo `dimsiss` -> `dismiss` in changelog (#33116)
mjankowski Nov 30, 2024
48827e1
Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-s…
ClearlyClaire Dec 1, 2024
b779f9e
[Glitch] Fix CSS warnings
c960657 Nov 22, 2024
c2f6ab6
[Glitch] Fix accounts table long display name
WebCoder49 Nov 22, 2024
0fcbdc0
[Glitch] Update immutable imports for v5
nschonni Nov 22, 2024
a518b60
[Glitch] Fix username and display name being hidden on narrow screens…
ClearlyClaire Nov 25, 2024
bdbe7c3
[Glitch] Fix arrow in the wrong place on empty list members screen in…
Gargron Nov 25, 2024
7d52d5d
Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-s…
ClearlyClaire Dec 1, 2024
cedacd6
[Glitch] Remove old notifications route from web UI
Gargron Nov 26, 2024
f441e3d
[Glitch] Change onboarding flow in web UI
Gargron Nov 26, 2024
170f76c
[Glitch] Add link from Web UI for Hashtags to the Moderation UI
ThisIsMissEm Nov 29, 2024
64fc79c
[Glitch] Change design of modal loading and error screens in web UI
Gargron Nov 29, 2024
10a24d6
Merge commit '75ecc6df068ec2c21b26f05692eb5dfdc35671fa' into glitch-s…
ClearlyClaire Dec 1, 2024
e03b586
[Glitch] Change server rules to be collapsible
Gargron Nov 29, 2024
b55c31e
[Glitch] Change "social web" to "fediverse" in a few banners in web UI
Gargron Nov 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore stdout logging setting in development environment (mastodon#3…
  • Loading branch information
mjankowski authored Nov 24, 2024
commit a20dca73277acd305f1e804bf8d778a5deaef658
5 changes: 5 additions & 0 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@

config.action_controller.forgery_protection_origin_check = ENV['DISABLE_FORGERY_REQUEST_PROTECTION'].nil?

ActiveSupport::Logger.new($stdout).tap do |logger|
logger.formatter = config.log_formatter
config.logger = ActiveSupport::TaggedLogging.new(logger)
end

# Generate random VAPID keys
Webpush.generate_key.tap do |vapid_key|
config.x.vapid_private_key = vapid_key.private_key
Expand Down