diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/setting/setting.go | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 7be0842b56..5400bf5b9f 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -402,11 +402,6 @@ var ( MaxTokenLength: math.MaxInt16, } - // FIXME: DEPRECATED to be removed in v1.18.0 - U2F = struct { - AppID string - }{} - // Metrics settings Metrics = struct { Enabled bool @@ -1103,16 +1098,6 @@ func loadFromConf(allowEmpty bool, extraConfig string) { for _, emoji := range UI.CustomEmojis { UI.CustomEmojisMap[emoji] = ":" + emoji + ":" } - - // FIXME: DEPRECATED to be removed in v1.18.0 - U2F.AppID = strings.TrimSuffix(AppURL, "/") - if Cfg.Section("U2F").HasKey("APP_ID") { - log.Error("Deprecated setting `[U2F]` `APP_ID` present. This fallback will be removed in v1.18.0") - U2F.AppID = Cfg.Section("U2F").Key("APP_ID").MustString(strings.TrimSuffix(AppURL, "/")) - } else if Cfg.Section("u2f").HasKey("APP_ID") { - log.Error("Deprecated setting `[u2]` `APP_ID` present. This fallback will be removed in v1.18.0") - U2F.AppID = Cfg.Section("u2f").Key("APP_ID").MustString(strings.TrimSuffix(AppURL, "/")) - } } func parseAuthorizedPrincipalsAllow(values []string) ([]string, bool) { |