Skip to content

Commit 7a28292

Browse files
Merge branch 'develop' into feat/fetch-active-review-types-only
2 parents e8c01c6 + 5bb5a1a commit 7a28292

File tree

40 files changed

+516
-92
lines changed

40 files changed

+516
-92
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,14 @@ workflows:
349349
filters:
350350
branches:
351351
only:
352-
- free
352+
- develop
353353
# This is alternate dev env for parallel testing
354354
- "build-test":
355355
context : org-global
356356
filters:
357357
branches:
358-
only:
359-
- free
358+
only:
359+
- tco23
360360
# This is alternate dev env for parallel testing
361361
- "build-qa":
362362
context : org-global
@@ -370,7 +370,7 @@ workflows:
370370
filters:
371371
branches:
372372
only:
373-
- footer-update
373+
- social-share-updates
374374
# This is stage env for production QA releases
375375
- "build-prod-staging":
376376
context : org-global

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ exports[`renders a full Profile correctly 1`] = `
713713
"unsubscribe": null,
714714
}
715715
}
716+
tcAcademyCertifications={Array []}
716717
/>
717718
`;
718719

@@ -862,5 +863,6 @@ exports[`renders an empty Profile correctly 1`] = `
862863
"unsubscribe": null,
863864
}
864865
}
866+
tcAcademyCertifications={Array []}
865867
/>
866868
`;

config/default.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ module.exports = {
444444
GIGS_PAGES_PATH: '/gigs',
445445
GIGS_LISTING_CACHE_TIME: 300, // in seconds
446446
START_PAGE_PATH: '/start',
447+
TC_ACADEMY_BASE_PATH: '/learn',
447448
GUIKIT: {
448449
DEBOUNCE_ON_CHANGE_TIME: 150,
449450
},
@@ -452,4 +453,5 @@ module.exports = {
452453
SDK_KEY: '7V4CJhurXT3Y3bnzv1hv1',
453454
},
454455
PLATFORM_SITE_URL: 'https://platform.topcoder-dev.com',
456+
PLATFORMUI_SITE_URL: 'https://platform-ui.topcoder-dev.com',
455457
};

config/development.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ module.exports = {
55
USER_SETTINGS: '', /* No dev server is available for saved searches */
66
},
77
PLATFORM_SITE_URL: 'https://platform.topcoder-dev.com',
8+
PLATFORMUI_SITE_URL: 'https://platform-ui.topcoder-dev.com',
89
};

config/production.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,4 +226,5 @@ module.exports = {
226226
TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
227227
ENABLE_RECOMMENDER: true,
228228
PLATFORM_SITE_URL: 'https://platform.topcoder.com',
229+
PLATFORMUI_SITE_URL: 'https://platform-ui.topcoder.com',
229230
};
20.1 KB
Loading
-67.9 KB
Loading
-251 KB
Loading
78.8 KB
Loading
167 KB
Loading

0 commit comments

Comments
 (0)