diff options
| author | Wim <wim@42.be> | 2022-08-13 16:14:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-13 16:14:26 +0200 |
| commit | 6a3fc713978a0c1c9290a4afd08b47886b49b635 (patch) | |
| tree | aa62cd85cf5671646c75ee38b3fc140ef7edcea8 /vendor/github.com/mattermost/mattermost-server | |
| parent | 3c4192ebf6a32e30cdd23a9644c2ceca72a006fa (diff) | |
| download | matterbridge-msglm-6a3fc713978a0c1c9290a4afd08b47886b49b635.tar.gz matterbridge-msglm-6a3fc713978a0c1c9290a4afd08b47886b49b635.tar.bz2 matterbridge-msglm-6a3fc713978a0c1c9290a4afd08b47886b49b635.zip | |
Update dependencies and go1.18 (#1873)
* Update dependencies and go1.18
* Exclude unnecessary linters and update build to go1.18
Diffstat (limited to 'vendor/github.com/mattermost/mattermost-server')
| -rw-r--r-- | vendor/github.com/mattermost/mattermost-server/v6/model/config.go | 8 | ||||
| -rw-r--r-- | vendor/github.com/mattermost/mattermost-server/v6/model/version.go | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/vendor/github.com/mattermost/mattermost-server/v6/model/config.go b/vendor/github.com/mattermost/mattermost-server/v6/model/config.go index 5fb29be8..e29c8efa 100644 --- a/vendor/github.com/mattermost/mattermost-server/v6/model/config.go +++ b/vendor/github.com/mattermost/mattermost-server/v6/model/config.go @@ -536,13 +536,7 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) { s.Forward80To443 = NewBool(false) } - if isUpdate { - // When updating an existing configuration, ensure that defaults are set. - if s.TrustedProxyIPHeader == nil { - s.TrustedProxyIPHeader = []string{HeaderForwarded, HeaderRealIP} - } - } else { - // When generating a blank configuration, leave the list empty. + if s.TrustedProxyIPHeader == nil { s.TrustedProxyIPHeader = []string{} } diff --git a/vendor/github.com/mattermost/mattermost-server/v6/model/version.go b/vendor/github.com/mattermost/mattermost-server/v6/model/version.go index 4e255826..3c8bf553 100644 --- a/vendor/github.com/mattermost/mattermost-server/v6/model/version.go +++ b/vendor/github.com/mattermost/mattermost-server/v6/model/version.go @@ -13,6 +13,8 @@ import ( // It should be maintained in chronological order with most current // release at the front of the list. var versions = []string{ + "6.7.2", + "6.7.1", "6.7.0", "6.6.0", "6.5.0", |