Skip to content

Commit

Permalink
Merge branch 'main' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
nijel authored Jul 31, 2023
2 parents a5e5bc8 + 2d489ce commit eaee2ca
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 97 deletions.
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ body:
attributes:
value: |
Thank you for reporting an issue on Weblate! This form will guide you to create a useful issue report.
Want your answer quickly and guaranteed? Visit https://weblate.org/support/ to reach our dedicated support team. As a subscriber, you will always have priority and help Weblate growing.
- type: textarea
id: what-happened
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ contact_links:
- name: Get professional support
url: https://weblate.org/support/
about: As a subscriber, you will always receive fast and helpful replies from our dedicated support team. More responsible and faster for your business, also makes Weblate stronger.
- name: Ask a question
- name: Ask the community
url: https://github.com/WeblateOrg/weblate/discussions
about: Want to discuss something with a community? Do it in discussions!
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ body:
attributes:
value: |
Thank you for reporting an issue on Weblate! This form will guide you to create a useful issue report.
Want your answer quickly and guaranteed? Visit https://weblate.org/support/ to reach our dedicated support team. As a subscriber, you will always have priority and help Weblate growing.
- type: textarea
id: describe
attributes:
Expand Down
76 changes: 0 additions & 76 deletions .github/ISSUE_TEMPLATE/support_question.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# Automated dependency updates
- color: e3f49c
name: dependencies
description: Pull requests that update a dependency file.
description: Third-party library dependencies.
# Hacktoberfest
- color: 7057ff
name: hacktoberfest
Expand Down
11 changes: 11 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@
"#\\s?renovate: image=(?<depName>.*?)\\s?appVersion:\\s?\\\"?(?<currentValue>[\\w+\\.\\-]*)"
],
"datasourceTemplate": "docker"
},
{
"fileMatch": [
"weblate_web/data.py"
],
"matchStrings": [
"VERSION = \"(?<currentValue>.*?)\""
],
"depNameTemplate": "Weblate",
"datasourceTemplate": "pypi",
"versioningTemplate": "pep440"
}
]
}
9 changes: 3 additions & 6 deletions .github/workflows/label-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,14 @@ on:
- .github/workflows/label-sync.yml

permissions:
contents: read
issues: write

jobs:
build:
name: Sync labels
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: micnncim/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ github.repository }}
- uses: srealmoreno/label-sync-action@v1
with:
manifest: .github/labels.yml
clean-labels: true
9 changes: 6 additions & 3 deletions .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,13 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
body: >
This issue looks more like a support question than an
issue. We strive to answer these reasonably fast, but
This issue has been marked as a question by a Weblate team member.
Why? Because it belongs more to the professional [Weblate Care](https://care.weblate.org/)
or community [Discussions](https://github.com/WeblateOrg/weblate/discussions) than here.
We strive to answer these reasonably fast here, too, but
[purchasing the support subscription](https://weblate.org/support/)
is not only more responsible and faster for your business but also makes Weblate stronger.
is more responsible and faster for your business.
And it makes Weblate stronger as well. Thanks!
In case your question is already answered, [making a donation](https://weblate.org/donate/) is the right way to say thank you!
Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@ repos:
hooks:
- id: isort
- repo: https://github.com/asottile/pyupgrade
rev: v3.8.0
rev: v3.10.1
hooks:
- id: pyupgrade
args: [--py39-plus]
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 22.12.0
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.276
rev: v0.0.281
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/asottile/blacken-docs
rev: 1.14.0
rev: 1.15.0
hooks:
- id: blacken-docs
- repo: meta
hooks:
- id: check-hooks-apply
- id: check-useless-excludes
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.9.0
rev: v2.10.0
hooks:
- id: pretty-format-yaml
args: [--autofix, --indent, '2']
Expand Down
12 changes: 7 additions & 5 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ SPDX-License-Identifier: CC0-1.0
This file is maintained in https://github.com/WeblateOrg/meta/
-->

# Weblate Security
# Weblate security

We take security very seriously at Weblate. We welcome any peer review of our
100% open source code to ensure nobody's Weblate is ever compromised or hacked.
The Weblate team takes security and related transparency very seriously.
We welcome any peer review of our 100% open-source code to ensure nobody's Weblate
is ever compromised or hacked.

You can find more information on reporting security issues in
[our documentation][1] and on [our page at HackerOne][2].
Information about practices for reporting and fixing security issues is described
in [our documentation][1] and on [our page at HackerOne][2]. This ensures all
vulnerabilities are solved securely, quickly, and transparently.

[1]: https://docs.weblate.org/en/latest/contributing/issues.html#security
[2]: https://hackerone.com/weblate

0 comments on commit eaee2ca

Please sign in to comment.