Skip to content

Commit

Permalink
Merge branch 'master' into patch-release-note-3-4-114
Browse files Browse the repository at this point in the history
  • Loading branch information
ritawatson committed Sep 21, 2023
2 parents 617a754 + 8fed09e commit d7d53e7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ name: Release to Production
on:
push:
branches: ['master', 'version-**']
workflow_dispatch:


env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version-branch-update.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Version Branch Update

on:
pull_request_target:
pull_request:
branches:
- 'version-[0-9]-[0-9]'
types: [opened, synchronize, reopened]
Expand Down
2 changes: 1 addition & 1 deletion docs/docs-content/audit-logs/audit-logs.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
sidebar_label: "Audit Logs"
title: "Audit Logss"
title: "Audit Logs"
description: "Learn about auditing in Palette and how to access audit logs."
hide_table_of_contents: false
sidebar_custom_props:
Expand Down
2 changes: 1 addition & 1 deletion scripts/netlify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


# List of branches to NOT create an automatic Netlify preview
disallowed_branches=("master" "release-*" "version-*")
disallowed_branches=("master" "release-*" "version-*" "backport/**")

# Get current branch name
current_branch=$(git branch --show-current)
Expand Down

0 comments on commit d7d53e7

Please sign in to comment.