Skip to content

Commit 9fe4aa9

Browse files
committed
chore: sync with WeblateOrg/meta
1 parent ff792b7 commit 9fe4aa9

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,12 @@ simplify = true
4141

4242
[*.{kt,kts}]
4343
indent_size = 4
44+
45+
# ktlint configuration
46+
ktlint_code_style = android_studio
47+
ktlint_function_naming_ignore_when_annotated_with = Composable
48+
ktlint_standard_class-signature = disabled
49+
ktlint_standard_function-expression-body = disabled
50+
ktlint_standard_mixed-condition-operators = disabled
51+
ktlint_standard_package-name = disabled
52+
ktlint_standard_property-naming = disabled

.github/workflows/pull_requests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
weblate-automerge:
1616
runs-on: ubuntu-slim
1717
name: Weblate automerge
18-
if: github.actor == 'weblate'
18+
if: github.event.pull_request.user.login == 'weblate' || github.event.pull_request.user.login == 'hosted-weblate[bot]'
1919
steps:
2020
- name: Enable Pull Request Automerge
2121
run: gh pr merge --repo "$GITHUB_REPOSITORY" --rebase --auto "$PR_NUMBER"

0 commit comments

Comments
 (0)