Skip to content

Commit ca67b6b

Browse files
authored
Merge branch 'develop' into milestone-v1.3
2 parents 218802d + 8b441f5 commit ca67b6b

File tree

8 files changed

+3
-81
lines changed

8 files changed

+3
-81
lines changed

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,7 @@ workflows:
230230
filters:
231231
branches:
232232
only:
233-
- milestone-v1.3
234-
- milestone-20200910
233+
- develop
235234
# This is alternate dev env for parallel testing
236235
- "build-test":
237236
context : org-global
@@ -253,6 +252,7 @@ workflows:
253252
filters:
254253
branches:
255254
only:
255+
- integration-v5-challenge-api
256256
- hot-fix
257257
# This is stage env for production QA releases
258258
- "build-prod-staging":

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
138138
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
139139
"tc-ui": "^1.0.12",
140-
"topcoder-react-lib": "1000.22.3",
140+
"topcoder-react-lib": "1000.22.4",
141141
"topcoder-react-ui-kit": "2.0.0",
142142
"topcoder-react-utils": "0.7.8",
143143
"turndown": "^4.0.2",

src/shared/components/tc-communities/communities/cognitive/GetStarted/index.jsx

-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import cardImg02 from
2020

2121
import MarchMadnessBanner from '../MarchMadnessBanner';
2222

23-
import NewsSignup from '../NewsSignup';
24-
2523
import style from './style.scss';
2624

2725
export default function GetStarted({ baseUrl }) {
@@ -88,7 +86,6 @@ export default function GetStarted({ baseUrl }) {
8886
/>
8987
</ImageText>
9088
</div>
91-
<NewsSignup />
9289
</main>
9390
);
9491
}

src/shared/components/tc-communities/communities/cognitive/Home/index.jsx

-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { config, Link } from 'topcoder-react-utils';
1616
import davePhotoUrl from 'assets/images/communities/cognitive/home/dave.jpg';
1717

1818
import IbmCloudBanner from '../IbmCloudBanner';
19-
import NewsletterSignup from '../NewsSignup';
2019

2120
import style from './style.scss';
2221

@@ -317,8 +316,6 @@ export default function Home({
317316
</div>
318317
</div>
319318
</div>
320-
321-
<NewsletterSignup />
322319
</main>
323320
);
324321
}

src/shared/components/tc-communities/communities/cognitive/IbmCloudPage/index.jsx

-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import React from 'react';
44
import Differences from './Differences';
55
import HeadBanner from './HeadBanner';
66
import JoinBlock from './JoinBlock';
7-
import NewsSignup from '../NewsSignup';
87

98
export default function IbmCloudPage() {
109
return (
@@ -16,8 +15,6 @@ export default function IbmCloudPage() {
1615
{/* Hidden by the request from Trevor: the transition process won't start
1716
* until Feb 12. */}
1817
{/* <AutoTransition /> */}
19-
20-
<NewsSignup />
2118
</div>
2219
);
2320
}

src/shared/components/tc-communities/communities/cognitive/NewsSignup/index.jsx

-21
This file was deleted.

src/shared/components/tc-communities/communities/cognitive/NewsSignup/theme.scss

-46
This file was deleted.

src/shared/components/tc-communities/communities/cognitive/Resources/index.jsx

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import MsgsSvg from
2424
import { Button, PrimaryButton } from 'topcoder-react-ui-kit';
2525

2626
import FaqItem from './FaqItem';
27-
import NewsSignup from '../NewsSignup';
2827

2928
import style from './style.scss';
3029

@@ -324,7 +323,6 @@ export default function Resources({
324323
</div>
325324
</div>
326325
</div>
327-
<NewsSignup />
328326
</main>
329327
);
330328
}

0 commit comments

Comments
 (0)