Skip to content

[pull] master from mattermost:master #459

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
Jan 26, 2026
Merged

[pull] master from mattermost:master #459

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
b62727e
[MM-67290] Document that Elasticsearch backend type change requires s…
lieut-data Jan 26, 2026
df00184
fix merge defect on server/channels/app/post_test.go (#35057)
isacikgoz Jan 26, 2026
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
4 changes: 2 additions & 2 deletions server/channels/app/post_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1972,7 +1972,7 @@ func TestUpdatePost(t *testing.T) {
Message: "original message",
UserId: th.BasicUser.Id,
}
createdPost, err := th.App.CreatePost(th.Context, post, th.BasicChannel, model.CreatePostFlags{})
createdPost, _, err := th.App.CreatePost(th.Context, post, th.BasicChannel, model.CreatePostFlags{})
require.Nil(t, err)

// Try to update with spoofed embeds (the attack vector)
Expand All @@ -1998,7 +1998,7 @@ func TestUpdatePost(t *testing.T) {
},
}

updatedPost, err := th.App.UpdatePost(th.Context, updatePost, nil)
updatedPost, _, err := th.App.UpdatePost(th.Context, updatePost, nil)
require.Nil(t, err)
require.NotNil(t, updatedPost.Metadata)

Expand Down
4 changes: 2 additions & 2 deletions .../channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
disabled={true}
helpText={
<Memo(MemoizedFormattedMessage)
defaultMessage="The type of the search backend."
defaultMessage="The type of the search backend. Changing this setting requires a server restart before taking effect."
id="admin.elasticsearch.backendDescription"
/>
}
Expand Down Expand Up @@ -537,7 +537,7 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
disabled={false}
helpText={
<Memo(MemoizedFormattedMessage)
defaultMessage="The type of the search backend."
defaultMessage="The type of the search backend. Changing this setting requires a server restart before taking effect."
id="admin.elasticsearch.backendDescription"
/>
}
Expand Down
2 changes: 1 addition & 1 deletion webapp/channels/src/components/admin_console/elasticsearch_settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ export default class ElasticsearchSettings extends OLDAdminSettings<Props, State
helpText={
<FormattedMessage
id='admin.elasticsearch.backendDescription'
defaultMessage='The type of the search backend.'
defaultMessage='The type of the search backend. Changing this setting requires a server restart before taking effect.'
/>
}
value={this.state.backend}
Expand Down
2 changes: 1 addition & 1 deletion webapp/channels/src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@
"admin.database.search_backend.title": "Active Search Backend:",
"admin.database.title": "Database",
"admin.developer.title": "Developer Settings",
"admin.elasticsearch.backendDescription": "The type of the search backend.",
"admin.elasticsearch.backendDescription": "The type of the search backend. Changing this setting requires a server restart before taking effect.",
"admin.elasticsearch.backendExample": "E.g.: \"elasticsearch\"",
"admin.elasticsearch.backendTitle": "Backend type:",
"admin.elasticsearch.bulkIndexingTitle": "Bulk Indexing:",
Expand Down
Loading