Skip to content

Commit

Permalink
Merge branch 'main' into b-2578-default-poll-method-for-motions
Browse files Browse the repository at this point in the history
  • Loading branch information
luisa-beerboom authored Sep 5, 2024
2 parents 2364408 + 95e0815 commit c1c5489
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
private_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}

- name: Create or update PR
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
path: service-repository
token: ${{ steps.generate-token.outputs.token }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pick-to-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
private_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}

- name: Create or update PR
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: ${{ steps.generate-token.outputs.token }}
branch: apply/commit-${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging-to-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
private_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}

- name: Create or update PR
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: ${{ steps.generate-token.outputs.token }}
commit-message: ${{ github.event.commits[0].message }}
Expand Down
1 change: 0 additions & 1 deletion models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4204,7 +4204,6 @@ chat_message:
type: relation
to: meeting_user/chat_message_ids
restriction_mode: A
required: true
constant: true
chat_group_id:
type: relation
Expand Down

0 comments on commit c1c5489

Please sign in to comment.