Skip to content

Commit 2a43124

Browse files
Merge branch 'develop' into submission_delete_button
2 parents e57096b + 30f5d21 commit 2a43124

File tree

26 files changed

+273
-61
lines changed

26 files changed

+273
-61
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,7 @@ workflows:
349349
filters:
350350
branches:
351351
only:
352-
- develop
353-
- submission_delete_button
352+
- free
354353
# This is alternate dev env for parallel testing
355354
- "build-test":
356355
context : org-global
@@ -364,21 +363,22 @@ workflows:
364363
filters:
365364
branches:
366365
only:
367-
- free
366+
- reskin-profile-settings
368367
# This is beta env for production soft releases
369368
- "build-prod-beta":
370369
context : org-global
371370
filters:
372371
branches:
373372
only:
374-
- footer-update
373+
- social-share-updates
375374
# This is stage env for production QA releases
376375
- "build-prod-staging":
377376
context : org-global
378377
filters: &filters-staging
379378
branches:
380379
only:
381380
- develop
381+
- old-mm-fix
382382
# Production builds are exectuted
383383
# when PR is merged to the master
384384
# Don't change anything in this configuration

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"supertest": "^3.1.0",
154154
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
155155
"tc-ui": "^1.0.12",
156-
"topcoder-react-lib": "1.2.8",
156+
"topcoder-react-lib": "1.2.10",
157157
"topcoder-react-ui-kit": "2.0.1",
158158
"topcoder-react-utils": "0.7.8",
159159
"turndown": "^4.0.2",
20.1 KB
Loading
-67.9 KB
Loading
-251 KB
Loading
78.8 KB
Loading
167 KB
Loading
-735 KB
Binary file not shown.
912 KB
Loading
913 KB
Loading

0 commit comments

Comments
 (0)