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

Commit c972275

Browse files
brianlovinbrianlovin
authored
Merge pull request #4532 from withspectrum/2.5.6
2.5.6
2 parents b1363bb + 632e765 commit c972275

File tree

31 files changed

+348
-128
lines changed

31 files changed

+348
-128
lines changed

‎analytics/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@
66
},
77
"dependencies": {
88
"amplitude": "^3.5.0",
9-
"aws-sdk": "^2.373.0",
9+
"aws-sdk": "^2.383.0",
1010
"bull": "3.3.10",
1111
"datadog-metrics": "^0.8.1",
12-
"debug": "^4.1.0",
12+
"debug": "^4.1.1",
1313
"faker": "^4.1.0",
1414
"ioredis": "3.2.2",
1515
"lodash.intersection": "^4.4.0",
1616
"node-env-file": "^0.1.8",
1717
"now-env": "^3.1.0",
18+
"performance-now": "^2.1.0",
1819
"raven": "^2.6.4",
1920
"redis-tag-cache": "^1.2.1",
21+
"rethinkdb-inspector": "^0.3.3",
2022
"rethinkdbdash": "^2.3.31",
2123
"rethinkhaberdashery": "^2.3.32",
2224
"sanitize-filename": "^1.6.1",

‎analytics/yarn.lock‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ asynckit@^0.4.0:
1414
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
1515
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
1616

17-
aws-sdk@^2.373.0:
18-
version "2.373.0"
19-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.373.0.tgz#fcc5606634b3b11d80810ad252d1b52b3733d780"
20-
integrity sha512-NZYXwXGtFt9jxaKXc+PJsLPnpbD03t0MAZRxh93g36kbFMuRXtY8CDqHYNQ0ZcrgQpXbCQiz1fxT5/wu5Cu70g==
17+
aws-sdk@^2.383.0:
18+
version "2.383.0"
19+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.383.0.tgz#86045c0a4a4898dca84a4877cbe765b7dc0f8bba"
20+
integrity sha512-PN+s+NTABtBloS46c7C2dvoEzrdY2NZ5nsfljL3xDX2rvjJEQxdchS2jcCpyc5ZNudFwta66wY4EGBZqf4Attw==
2121
dependencies:
2222
buffer "4.9.1"
2323
events "1.1.1"
@@ -150,10 +150,10 @@ debug@^3.1.0:
150150
dependencies:
151151
ms "^2.1.1"
152152

153-
debug@^4.1.0:
154-
version "4.1.0"
155-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
156-
integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
153+
debug@^4.1.1:
154+
version "4.1.1"
155+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
156+
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
157157
dependencies:
158158
ms "^2.1.1"
159159

@@ -485,6 +485,11 @@ object-keys@^1.0.12:
485485
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
486486
integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
487487

488+
performance-now@^2.1.0:
489+
version "2.1.0"
490+
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
491+
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
492+
488493
process-nextick-args@~2.0.0:
489494
version "2.0.0"
490495
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
@@ -568,6 +573,11 @@ redis-tag-cache@^1.2.1:
568573
dependencies:
569574
ioredis "^4.0.0"
570575

576+
rethinkdb-inspector@^0.3.3:
577+
version "0.3.3"
578+
resolved "https://registry.yarnpkg.com/rethinkdb-inspector/-/rethinkdb-inspector-0.3.3.tgz#f0d88c66d17e0234b5518ca51cd8c272cb787003"
579+
integrity sha512-1R0S5maattWOptfkHsU5ulXnt6FIKqjgyEdd8WgW9QbYMiHaXNqkHTAsmtXXSAf0j5iFH3F2qq/7eg4xwb8Euw==
580+
571581
rethinkdbdash@^2.3.31:
572582
version "2.3.31"
573583
resolved "https://registry.yarnpkg.com/rethinkdbdash/-/rethinkdbdash-2.3.31.tgz#fe2f73d1fa6e6f5d96d8e881292013cf6dca914d"

‎api/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"datadog-metrics": "^0.8.1",
2828
"dataloader": "^1.4.0",
2929
"debounce": "^1.2.0",
30-
"debug": "^4.1.0",
30+
"debug": "^4.1.1",
3131
"decode-uri-component": "^0.2.0",
3232
"draft-js": "^0.10.5",
3333
"draft-js-code-editor-plugin": "0.2.1",
@@ -98,13 +98,13 @@
9898
"react-helmet": "5.x",
9999
"react-infinite-scroller-with-scroll-element": "^1.0.4",
100100
"react-loadable": "5.2.2",
101-
"react-modal": "^3.7.1",
101+
"react-modal": "^3.8.1",
102102
"react-redux": "^5.1.1",
103103
"react-remarkable": "^1.1.1",
104104
"react-router": "^4.0.0-beta.7",
105105
"react-router-dom": "^4.0.0-beta.7",
106106
"react-textarea-autosize": "^4.0.5",
107-
"react-transition-group": "^2.5.0",
107+
"react-transition-group": "^2.5.2",
108108
"react-trend": "^1.2.4",
109109
"recompose": "^0.23.1",
110110
"redis-tag-cache": "^1.2.1",
@@ -116,7 +116,7 @@
116116
"rethinkdb-migrate": "^1.4.0",
117117
"rethinkhaberdashery": "^2.3.32",
118118
"sanitize-filename": "^1.6.1",
119-
"serialize-javascript": "^1.5.0",
119+
"serialize-javascript": "^1.6.1",
120120
"session-rethinkdb": "^2.0.0",
121121
"slate": "^0.44.9",
122122
"slate-markdown": "0.1.0",

‎api/routes/auth/google.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ import { createSigninRoutes } from './create-signin-routes';
44

55
const googleAuthRouter = Router();
66
const { main, callbacks } = createSigninRoutes('google', {
7-
scope: [
8-
'https://www.googleapis.com/auth/plus.login',
9-
'https://www.googleapis.com/auth/plus.profile.emails.read',
10-
],
7+
scope: 'profile email',
118
});
129

1310
googleAuthRouter.get('/', main);

‎api/yarn.lock‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3172,6 +3172,13 @@ debug@^4.1.0:
31723172
dependencies:
31733173
ms "^2.1.1"
31743174

3175+
debug@^4.1.1:
3176+
version "4.1.1"
3177+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
3178+
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
3179+
dependencies:
3180+
ms "^2.1.1"
3181+
31753182
debuglog@^1.0.0:
31763183
version "1.0.1"
31773184
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -7746,10 +7753,10 @@ [email protected]:
77467753
resolved "https://registry.yarnpkg.com/react-loadable/-/react-loadable-5.2.2.tgz#1a5ad75841cacb64be12b18a86ac0bc55ccb4dc7"
77477754
integrity sha1-GlrXWEHKy2S+ErGKhqwLxVzLTcc=
77487755

7749-
react-modal@^3.7.1:
7750-
version "3.7.1"
7751-
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.7.1.tgz#342ed170133d0557e6c3e6fc40195bc45c8f09c3"
7752-
integrity sha512-eSgotXkqOCXi0b27AwLCoJ8yqLepKnbZdMp/zfUmZPnMNoe39pDT0mbAPq9rp+TToqM5GUTv8C36Cuja+ThbhA==
7756+
react-modal@^3.8.1:
7757+
version "3.8.1"
7758+
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.8.1.tgz#7300f94a6f92a2e17994de0be6ccb61734464c9e"
7759+
integrity sha512-aLKeZM9pgXpIKVwopRHMuvqKWiBajkqisDA8UzocdCF6S4fyKVfLWmZR5G1Q0ODBxxxxf2XIwiCP8G/11GJAuw==
77537760
dependencies:
77547761
exenv "^1.2.0"
77557762
prop-types "^15.5.10"
@@ -7816,10 +7823,10 @@ react-textarea-autosize@^4.0.5:
78167823
dependencies:
78177824
prop-types "^15.5.8"
78187825

7819-
react-transition-group@^2.5.0:
7820-
version "2.5.1"
7821-
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.1.tgz#67fbd8d30ebb1c57a149d554dbb82eabefa61f0d"
7822-
integrity sha512-8x/CxUL9SjYFmUdzsBPTgtKeCxt7QArjNSte0wwiLtF/Ix/o1nWNJooNy5o9XbHIKS31pz7J5VF2l41TwlvbHQ==
7826+
react-transition-group@^2.5.2:
7827+
version "2.5.2"
7828+
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.2.tgz#9457166a9ba6ce697a3e1b076b3c049b9fb2c408"
7829+
integrity sha512-vwHP++S+f6KL7rg8V1mfs62+MBKtbMeZDR8KiNmD7v98Gs3UPGsDZDahPJH2PVprFW5YHJfh6cbNim3zPndaSQ==
78237830
dependencies:
78247831
dom-helpers "^3.3.1"
78257832
loose-envify "^1.4.0"
@@ -8427,11 +8434,16 @@ [email protected]:
84278434
range-parser "~1.2.0"
84288435
statuses "~1.4.0"
84298436

8430-
serialize-javascript@^1.4.0, serialize-javascript@^1.5.0:
8437+
serialize-javascript@^1.4.0:
84318438
version "1.5.0"
84328439
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
84338440
integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
84348441

8442+
serialize-javascript@^1.6.1:
8443+
version "1.6.1"
8444+
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
8445+
integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
8446+
84358447
[email protected]:
84368448
version "1.13.2"
84378449
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"

‎athena/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"start": "NODE_ENV=production node main.js"
66
},
77
"dependencies": {
8-
"aws-sdk": "^2.373.0",
8+
"aws-sdk": "^2.383.0",
99
"axios": "^0.16.2",
1010
"bull": "3.3.10",
1111
"cryptr": "^3.0.0",
1212
"datadog-metrics": "^0.8.1",
13-
"debug": "^4.1.0",
13+
"debug": "^4.1.1",
1414
"decode-uri-component": "^0.2.0",
1515
"draft-js": "^0.10.5",
1616
"emoji-regex": "^6.5.1",
@@ -21,8 +21,10 @@
2121
"lodash.intersection": "^4.4.0",
2222
"node-env-file": "^0.1.8",
2323
"now-env": "^3.1.0",
24+
"performance-now": "^2.1.0",
2425
"raven": "^2.6.4",
2526
"redis-tag-cache": "^1.2.1",
27+
"rethinkdb-inspector": "^0.3.3",
2628
"rethinkdbdash": "^2.3.31",
2729
"rethinkhaberdashery": "^2.3.32",
2830
"sanitize-filename": "^1.6.1",

‎athena/yarn.lock‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ asn1.js@^5.0.0:
2323
inherits "^2.0.1"
2424
minimalistic-assert "^1.0.0"
2525

26-
aws-sdk@^2.373.0:
27-
version "2.373.0"
28-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.373.0.tgz#fcc5606634b3b11d80810ad252d1b52b3733d780"
29-
integrity sha512-NZYXwXGtFt9jxaKXc+PJsLPnpbD03t0MAZRxh93g36kbFMuRXtY8CDqHYNQ0ZcrgQpXbCQiz1fxT5/wu5Cu70g==
26+
aws-sdk@^2.383.0:
27+
version "2.383.0"
28+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.383.0.tgz#86045c0a4a4898dca84a4877cbe765b7dc0f8bba"
29+
integrity sha512-PN+s+NTABtBloS46c7C2dvoEzrdY2NZ5nsfljL3xDX2rvjJEQxdchS2jcCpyc5ZNudFwta66wY4EGBZqf4Attw==
3030
dependencies:
3131
buffer "4.9.1"
3232
events "1.1.1"
@@ -175,10 +175,10 @@ debug@^3.1.0:
175175
dependencies:
176176
ms "^2.1.1"
177177

178-
debug@^4.1.0:
179-
version "4.1.0"
180-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
181-
integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
178+
debug@^4.1.1:
179+
version "4.1.1"
180+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
181+
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
182182
dependencies:
183183
ms "^2.1.1"
184184

@@ -640,6 +640,11 @@ object-keys@^1.0.12:
640640
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
641641
integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
642642

643+
performance-now@^2.1.0:
644+
version "2.1.0"
645+
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
646+
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
647+
643648
promise@^7.1.1:
644649
version "7.3.1"
645650
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -707,6 +712,11 @@ redis-tag-cache@^1.2.1:
707712
dependencies:
708713
ioredis "^4.0.0"
709714

715+
rethinkdb-inspector@^0.3.3:
716+
version "0.3.3"
717+
resolved "https://registry.yarnpkg.com/rethinkdb-inspector/-/rethinkdb-inspector-0.3.3.tgz#f0d88c66d17e0234b5518ca51cd8c272cb787003"
718+
integrity sha512-1R0S5maattWOptfkHsU5ulXnt6FIKqjgyEdd8WgW9QbYMiHaXNqkHTAsmtXXSAf0j5iFH3F2qq/7eg4xwb8Euw==
719+
710720
rethinkdbdash@^2.3.31:
711721
version "2.3.31"
712722
resolved "https://registry.yarnpkg.com/rethinkdbdash/-/rethinkdbdash-2.3.31.tgz#fe2f73d1fa6e6f5d96d8e881292013cf6dca914d"

‎chronos/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"start": "NODE_ENV=production node main.js"
44
},
55
"dependencies": {
6-
"aws-sdk": "^2.373.0",
6+
"aws-sdk": "^2.383.0",
77
"bull": "^3.5.2",
88
"datadog-metrics": "^0.8.1",
9-
"debug": "^4.1.0",
9+
"debug": "^4.1.1",
1010
"decode-uri-component": "^0.2.0",
1111
"draft-js": "^0.10.5",
1212
"faker": "^4.1.0",
@@ -15,8 +15,10 @@
1515
"lodash": "^4.17.11",
1616
"lodash.intersection": "^4.4.0",
1717
"now-env": "^3.1.0",
18+
"performance-now": "^2.1.0",
1819
"raven": "^2.6.4",
1920
"redis-tag-cache": "^1.2.1",
21+
"rethinkdb-inspector": "^0.3.3",
2022
"rethinkdbdash": "^2.3.31",
2123
"rethinkhaberdashery": "^2.3.32",
2224
"sanitize-filename": "^1.6.1",

‎chronos/queues/constants.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export const COMMUNITY_UPSELL_THRESHOLD = 5;
88
// the end weekly digest will have threads sorted by the weight of (TOTAL * WEIGHT) + (NEW * WEIGHT)
99
export const TOTAL_MESSAGE_COUNT_WEIGHT = 0.1;
1010
export const NEW_MESSAGE_COUNT_WEIGHT = 1.5;
11+
export const WATERCOOLER_WEIGHT_REDUCTION = 0.5;
1112

1213
/*
1314
Example weighting:

‎chronos/queues/digests/getReputationString.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ export const getReputationString = ({
1919
const during = timeframe === 'weekly' ? 'last week' : 'yesterday';
2020

2121
let reputationString;
22-
if (!hasGainedReputation) {
23-
reputationString = `You were a little quiet ${during} and haven't gained any reputation – join some of the conversations below, your communities would love to hear from you.`;
24-
} else {
22+
if (hasGainedReputation) {
2523
reputationString = `You gained ${reputationGained} reputation ${during}.`;
24+
} else {
25+
reputationString = `You didn’t gain any reputation ${during}.`;
2626
}
2727

2828
if (isFirstReputation) {

0 commit comments

Comments
 (0)