Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.

Commit 26e4bbe

Browse files
committed
Merge branch 'alpha' of github.com:withspectrum/spectrum into 3.1.12
2 parents ecd60ed + db9e9ba commit 26e4bbe

File tree

4 files changed

+9
-84
lines changed

4 files changed

+9
-84
lines changed

api/migrations/20190501021006-remove-all-private-channel-members.js

Lines changed: 0 additions & 75 deletions
This file was deleted.

api/models/usersChannels.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ const createMemberInDefaultChannels = (communityId: string, userId: string): Pro
452452
};
453453

454454
// prettier-ignore
455-
const toggleUserChannelNotifications = async (userId: string, channelId: string, value: boolean): Promise<DBChannel> => {
455+
const toggleUserChannelNotifications = async (userId: string, channelId: string, value: boolean): Promise<?DBChannel> => {
456456
const event = value ? events.CHANNEL_NOTIFICATIONS_ENABLED : events.CHANNEL_NOTIFICATIONS_DISABLED
457457

458458
trackQueue.add({
@@ -490,7 +490,7 @@ const toggleUserChannelNotifications = async (userId: string, channelId: string,
490490
return createMemberInChannel(channelId, userId, false)
491491
}
492492

493-
return
493+
return null
494494
};
495495

496496
const removeUsersChannelMemberships = async (userId: string) => {

now.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"DEBUG": "shared:rethinkdb:db-query-cache",
1010
"S3_TOKEN": "@s3-token",
1111
"S3_SECRET": "@s3-secret",
12-
"COMPOSE_RETHINKDB_PASSWORD": "@github-compose-rethinkdb-password",
13-
"COMPOSE_RETHINKDB_URL": "@github-compose-rethinkdb-url",
14-
"COMPOSE_RETHINKDB_PORT": "@github-compose-rethinkdb-port",
15-
"BACKUP_RETHINKDB_URL": "@backup-compose-rethinkdb-url",
16-
"BACKUP_RETHINKDB_PORT": "@backup-compose-rethinkdb-port",
12+
"COMPOSE_RETHINKDB_PASSWORD": "@new-compose-rethinkdb-password",
13+
"COMPOSE_RETHINKDB_URL": "@new-compose-rethinkdb-url",
14+
"COMPOSE_RETHINKDB_PORT": "@new-compose-rethinkdb-port",
15+
"BACKUP_RETHINKDB_URL": "@new-backup-compose-rethinkdb-url",
16+
"BACKUP_RETHINKDB_PORT": "@new-backup-compose-rethinkdb-port",
1717
"AWS_RETHINKDB_PASSWORD": "@aws-rethinkdb-password",
1818
"AWS_RETHINKDB_URL": "@aws-rethinkdb-url",
1919
"AWS_RETHINKDB_PORT": "@aws-rethinkdb-port",

shared/imgix/sign.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ const defaultOpts = {
3636

3737
const signPrimary = (url: string, opts: Opts = defaultOpts): string => {
3838
const client = new ImgixClient({
39-
domains: ['spectrum.imgix.net'],
39+
domains: 'spectrum.imgix.net',
4040
secureURLToken: process.env.IMGIX_SECURITY_KEY,
4141
});
4242
return client.buildURL(url, opts);
4343
};
4444

4545
const signProxy = (url: string, opts?: Opts = defaultOpts): string => {
4646
const client = new ImgixClient({
47-
domains: ['spectrum-proxy.imgix.net'],
47+
domains: 'spectrum-proxy.imgix.net',
4848
secureURLToken: process.env.IMGIX_PROXY_SECURITY_KEY,
4949
});
5050
return client.buildURL(url, opts);

0 commit comments

Comments
 (0)