gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mattermost: update patches

Browse Source
This commit is contained in:
jose
2026-07-09 09:26:05 +08:00
parent 7e97f38e58
commit e269cab294
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch
+16 -3
View File
@@ -11,7 +11,7 @@ index 93cb8ab263..3d12cd5e54 100644
);
};
diff --git a/channels/src/components/header_footer_route/header.scss b/channels/src/components/header_footer_route/header.scss
index c2e6fbd187..828955cc79 100644
index c2e6fbd187..bc1cedcff1 100644
--- a/channels/src/components/header_footer_route/header.scss
+++ b/channels/src/components/header_footer_route/header.scss
@@ -47,20 +47,7 @@
@@ -36,6 +36,19 @@ index c2e6fbd187..828955cc79 100644
}
}
}
@@ -83,12 +70,6 @@
margin-top: 12px;
}
}
-
- &.has-free-banner.has-custom-site-name {
- .header-back-button {
- bottom: -20px;
- }
- }
}
@media screen and (max-width: 699px) {
diff --git a/channels/src/components/widgets/menu/menu_items/menu_item.scss b/channels/src/components/widgets/menu/menu_items/menu_item.scss
index dee9b57f8c..8ef4aa073a 100644
--- a/channels/src/components/widgets/menu/menu_items/menu_item.scss
@@ -57,14 +70,14 @@ index dee9b57f8c..8ef4aa073a 100644
button {
padding: 3px 0;
diff --git a/channels/webpack.config.js b/channels/webpack.config.js
index 852046de70..cf28fdcbd6 100644
index 852046de70..a310da48f4 100644
--- a/channels/webpack.config.js
+++ b/channels/webpack.config.js
@@ -470,6 +470,9 @@ if (targetIsDevServer) {
historyApiFallback: {
index: '/static/root.html',
},
+ client: {
+ client {
+ overlay: false,
+ },
},
pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch
+15 -4
View File
@@ -1,8 +1,19 @@
diff --git a/server/channels/app/limits.go b/server/channels/app/limits.go
index 4c88c1f049..fb7d84ef05 100644
index 45448e4b2b..6125c02baf 100644
--- a/server/channels/app/limits.go
+++ b/server/channels/app/limits.go
@@ -18,23 +18,8 @@ func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) {
@@ -10,8 +10,8 @@ import (
)
const (
- maxUsersLimit = 200
- maxUsersHardLimit = 250
+ maxUsersLimit = 10000000
+ maxUsersHardLimit = 10000000
)
// GetServerLimits returns the server's seat/post-history limits. The license-derived
@@ -25,23 +25,8 @@ func (a *App) GetServerLimits(includeUserCounts bool) (*model.ServerLimits, *mod
limits := &model.ServerLimits{}
license := a.License()
@@ -28,11 +39,11 @@ index 4c88c1f049..fb7d84ef05 100644
// Check if license has post history limits and get the calculated timestamp
if license != nil && license.Limits != nil && license.Limits.PostHistory > 0 {
@@ -99,14 +84,5 @@ func (a *App) GetPostHistoryLimit() int64 {
@@ -112,14 +97,5 @@ func (a *App) GetPostHistoryLimit() int64 {
}
func (a *App) isAtUserLimit() (bool, *model.AppError) {
- userLimits, appErr := a.GetServerLimits()
- userLimits, appErr := a.GetServerLimits(true)
- if appErr != nil {
- return false, appErr
- }