Skip to content

Commit f6dd34e

Browse files
authored
Merge branch 'develop' into tco23
2 parents ab1060f + 2991837 commit f6dd34e

File tree

67 files changed

+3028
-2263
lines changed

Some content is hidden

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

67 files changed

+3028
-2263
lines changed

.circleci/config.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ workflows:
349349
filters:
350350
branches:
351351
only:
352-
- reskin
352+
- reskin-profile
353353
# This is alternate dev env for parallel testing
354354
- "build-test":
355355
context : org-global
@@ -370,15 +370,16 @@ workflows:
370370
filters:
371371
branches:
372372
only:
373-
- free
373+
- footer-update
374+
- reskin-profile
374375
# This is stage env for production QA releases
375376
- "build-prod-staging":
376377
context : org-global
377378
filters: &filters-staging
378379
branches:
379380
only:
380381
- develop
381-
- stat_marathon_match_link
382+
- fix-security-headers
382383
# Production builds are exectuted
383384
# when PR is merged to the master
384385
# Don't change anything in this configuration

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

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

__tests__/shared/components/ProfilePage/Skill/index.jsx

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

0 commit comments

Comments
 (0)