Skip to content

Commit 24ff8eb

Browse files
authored
Merge pull request #4265 from topcoder-platform/develop
Bug fixes : Contentful and Navigation
2 parents 61f8c8b + 23b566a commit 24ff8eb

File tree

33 files changed

+879
-351
lines changed

33 files changed

+879
-351
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ workflows:
182182
filters:
183183
branches:
184184
only:
185-
- develop
186185
- feature-contentful
187186
# This is beta env for production soft releases
188187
- "build-prod-beta":
@@ -191,7 +190,7 @@ workflows:
191190
branches:
192191
only:
193192
- develop
194-
- hot-fix-profile-issue
193+
- hotfix-legacy-mm
195194
# Production builds are exectuted
196195
# when PR is merged to the master
197196
# Don't change anything in this configuration

__tests__/shared/components/Contentful/SearchBar/__snapshots__/SearchBar.jsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ exports[`Matches shallow shapshot 1`] = `
1313
onBlur={[Function]}
1414
onChange={[Function]}
1515
onFocus={[Function]}
16-
placeholder="Search.."
16+
placeholder="Search..."
1717
type="text"
1818
value=""
1919
/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ exports[`Default render 1`] = `
143143
"separator": true,
144144
},
145145
Object {
146-
"href": "https://community-app.topcoder-dev.com/thrive/tracks?track=Topcoder",
146+
"href": "/thrive/tracks?track=Topcoder",
147147
"title": "Help",
148148
},
149149
Object {

__tests__/shared/components/Settings/Preferences/__snapshots__/index.jsx.snap

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,17 @@ exports[`renders preferences setting page correctly 1`] = `
2323
width="30"
2424
xmlns="http://www.w3.org/2000/svg"
2525
/>,
26-
"invitation letter": <Invletter
27-
height="30"
28-
viewBox="0 0 30 30"
29-
width="30"
30-
xmlns="http://www.w3.org/2000/svg"
31-
/>,
3226
"payment": <Payment
3327
viewBox="0 0 34 30"
3428
xmlns="http://www.w3.org/2000/svg"
3529
/>,
36-
"referrals": <Referral
37-
height="30"
38-
viewBox="0 0 30 30"
39-
width="30"
40-
xmlns="http://www.w3.org/2000/svg"
41-
/>,
4230
}
4331
}
4432
names={
4533
Array [
4634
"e-mail",
4735
"forum",
4836
"payment",
49-
"invitation letter",
50-
"referrals",
5137
]
5238
}
5339
toggle={[Function]}

0 commit comments

Comments
 (0)