From 9c57546fbc71c7b144511f2073165d766dc0c558 Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Thu, 31 Jul 2025 11:46:41 -0300 Subject: [PATCH 1/2] Use a new Sentry key for v11+ (#33561) This will allow us to eventually rotate out the older key and deprecate reports from older Mattermost server versions. --- server/channels/app/server.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/server/channels/app/server.go b/server/channels/app/server.go index 485ceb8dcd7..c5fd548ccc6 100644 --- a/server/channels/app/server.go +++ b/server/channels/app/server.go @@ -83,12 +83,7 @@ const ( debugScheduledPostJobInterval = 2 * time.Second ) -var SentryDSN = "https://9d7c9cccf549479799f880bcf4f26323@o94110.ingest.sentry.io/5212327" - -// This is a placeholder to allow the existing release pipelines to run without failing to insert -// the key that's now hard-coded above. Remove this once we converge on the unified delivery -// pipeline in GitHub. -var _ = "placeholder_sentry_dsn" +var SentryDSN = "https://eaf281226106b5bba68694d1316da21c@o94110.ingest.us.sentry.io/5212327" type Server struct { // RootRouter is the starting point for all HTTP requests to the server. @@ -1411,7 +1406,7 @@ func (s *Server) doLicenseExpirationCheck() { }) } - //remove the license + // remove the license if appErr := s.RemoveLicense(); appErr != nil { mlog.Error("Error while removing the license.", mlog.Err(appErr)) } From 70f70416d55a9d615039f00b0a190c2c7387aed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20V=C3=A9lez?= Date: Thu, 31 Jul 2025 17:56:29 +0200 Subject: [PATCH 2/2] MM-64957 - fix autoscroll not working (#33595) --- webapp/channels/src/sass/components/_post.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/channels/src/sass/components/_post.scss b/webapp/channels/src/sass/components/_post.scss index 3dc9b46f711..c2fac3d640d 100644 --- a/webapp/channels/src/sass/components/_post.scss +++ b/webapp/channels/src/sass/components/_post.scss @@ -862,7 +862,7 @@ } .post__body { - padding: 2px 0; + padding: 2px 0 0 0; background: transparent !important; line-height: 1.5; @@ -1384,7 +1384,7 @@ .post__body { width: 100%; - padding: 0.2em 0; + padding: 0 0 0.2em; word-wrap: break-word; &-reactions-acks {