mirror of
https://github.com/element-hq/element-web
synced 2024-11-24 02:05:45 +03:00
Merge pull request #3213 from matrix-org/travis/remove-is-flag
Remove unused identityEnabled property from ValidatedServerConfig
This commit is contained in:
commit
5f98e4ea61
3 changed files with 0 additions and 5 deletions
|
@ -39,7 +39,6 @@ export const TYPES = {
|
|||
hsName: "matrix.org",
|
||||
hsNameIsDifferent: false,
|
||||
isUrl: "https://vector.im",
|
||||
identityEnabled: true,
|
||||
}),
|
||||
},
|
||||
PREMIUM: {
|
||||
|
|
|
@ -18,7 +18,6 @@ import React from 'react';
|
|||
import {AutoDiscovery} from "matrix-js-sdk";
|
||||
import {_t, _td, newTranslatableError} from "../languageHandler";
|
||||
import {makeType} from "./TypeUtils";
|
||||
import SdkConfig from "../SdkConfig";
|
||||
|
||||
const LIVELINESS_DISCOVERY_ERRORS = [
|
||||
AutoDiscovery.ERROR_INVALID_HOMESERVER,
|
||||
|
@ -31,7 +30,6 @@ export class ValidatedServerConfig {
|
|||
hsNameIsDifferent: string;
|
||||
|
||||
isUrl: string;
|
||||
identityEnabled: boolean;
|
||||
|
||||
isDefault: boolean;
|
||||
}
|
||||
|
@ -236,7 +234,6 @@ export default class AutoDiscoveryUtils {
|
|||
hsName: preferredHomeserverName,
|
||||
hsNameIsDifferent: url.hostname !== preferredHomeserverName,
|
||||
isUrl: preferredIdentityUrl,
|
||||
identityEnabled: !SdkConfig.get()['disable_identity_server'],
|
||||
isDefault: false,
|
||||
});
|
||||
}
|
||||
|
|
|
@ -268,7 +268,6 @@ export function mkServerConfig(hsUrl, isUrl) {
|
|||
hsName: "TEST_ENVIRONMENT",
|
||||
hsNameIsDifferent: false, // yes, we lie
|
||||
isUrl,
|
||||
identityEnabled: true,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue