Skip to content

Commit 3575562

Browse files
Igor GoroshkoIgor Goroshko
authored andcommitted
Merged DEV to feature-timeline-wall
2 parents 3caf1de + 182b8f7 commit 3575562

File tree

73 files changed

+3104
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+3104
-162
lines changed

.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ workflows:
349349
filters:
350350
branches:
351351
only:
352-
- free
352+
- TCA-539_tca-certifications-update-badges
353353
# This is alternate dev env for parallel testing
354354
- "build-test":
355355
context : org-global
@@ -363,7 +363,7 @@ workflows:
363363
filters:
364364
branches:
365365
only:
366-
- reskin-profile-settings
366+
- feat/badges-box
367367
# This is beta env for production soft releases
368368
- "build-prod-beta":
369369
context : org-global
@@ -379,6 +379,7 @@ workflows:
379379
only:
380380
- develop
381381
- old-mm-fix
382+
- reskin-profile-settings
382383
# Production builds are exectuted
383384
# when PR is merged to the master
384385
# Don't change anything in this configuration

__tests__/shared/__snapshots__/index.jsx.snap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ exports[`Snapshot match 1`] = `
2323
async={true}
2424
src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
2525
/>
26+
<script
27+
src="//cdn-3.convertexperiments.com/js/10005965-10006774.js"
28+
type="text/javascript"
29+
/>
2630
</HelmetWrapper>
2731
<withRouter(Connect(Routes)) />
2832
<Connect(ErrorMessageContainer) />
@@ -62,6 +66,10 @@ exports[`Snapshot match 2`] = `
6266
async={true}
6367
src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
6468
/>
69+
<script
70+
src="//cdn-3.convertexperiments.com/js/10005965-10006774.js"
71+
type="text/javascript"
72+
/>
6573
</HelmetWrapper>
6674
<withRouter(Connect(Routes)) />
6775
<Connect(ErrorMessageContainer) />

__tests__/shared/components/Header/__snapshots__/index.jsx.snap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,11 @@ exports[`Default render 1`] = `
136136
"openNewTab": true,
137137
"title": "Discord",
138138
},
139+
Object {
140+
"href": "https://platform-ui.topcoder-dev.com/learn",
141+
"openNewTab": true,
142+
"title": "Learn",
143+
},
139144
],
140145
"title": "COMMUNITY",
141146
},

0 commit comments

Comments
 (0)