Skip to content

Commit c64113a

Browse files
committed
merge master
2 parents 44feb32 + 33ced56 commit c64113a

Some content is hidden

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

51 files changed

+990
-530
lines changed

scripts/ignore.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ log=$(env -i git log -1 --pretty=%B)
66
# run a series of checks for common reasons that we shouldn't preview build.
77
# if no checks match, exit with code 1 to run the build
88

9+
# Force a build
10+
if echo $log | grep -1 'netlify\-build'; then
11+
echo "Force build becuase Netlify is a benevolent overseer"
12+
exit 1
13+
914
# ignore for simple typo fixes
10-
if echo "$log" | grep -q 'typo'; then
15+
elif echo "$log" | grep -q 'typo'; then
1116
echo "Build ignored because 'typo' is in the commit message."
1217
exit
1318
# ignore link / url updates
@@ -23,7 +28,7 @@ elif echo "$log" | grep -q 'dependabot'; then
2328
echo "Ignoring dependabot update"
2429
exit
2530
# ignore when master is merged into a branch
26-
elif echo "$log" | grep -q 'Merge branch \SMaster\S'; then
31+
elif echo "$log" | grep -q 'Merge branch \Smaster\S'; then
2732
echo "Build ignored because it's only an update from the main branch."
2833
exit
2934
else

src/_data/catalog/destination_categories.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# AUTOGENERATED FROM PUBLIC API. DO NOT EDIT
2-
# destination categories last updated 2021-06-11
1+
# AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
2+
# destination categories last updated 2021-06-23
33
items:
44
- display_name: Email Marketing
55
slug: email-marketing

0 commit comments

Comments
 (0)