Skip to content

[pull] master from mattermost:master #166

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.

Sign up for GitHub

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

Merged
pull merged 2 commits into from
Jul 31, 2025
Merged

[pull] master from mattermost:master #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c57546
Use a new Sentry key for v11+ (#33561)
lieut-data Jul 31, 2025
70f7041
MM-64957 - fix autoscroll not working (#33595)
pvev Jul 31, 2025
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
9 changes: 2 additions & 7 deletions server/channels/app/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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))
}
Expand Down
4 changes: 2 additions & 2 deletions webapp/channels/src/sass/components/_post.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@
}

.post__body {
padding: 2px 0;
padding: 2px 0 0 0;
background: transparent !important;
line-height: 1.5;

Expand Down Expand Up @@ -1384,7 +1384,7 @@

.post__body {
width: 100%;
padding: 0.2em 0;
padding: 0 0 0.2em;
word-wrap: break-word;

&-reactions-acks {
Expand Down
Loading