forked from mastodon/mastodon
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into hiyuki/master
# Conflicts: # app/helpers/context_helper.rb # app/javascript/mastodon/locales/cy.json # app/javascript/mastodon/locales/eo.json # app/views/settings/profiles/show.html.haml # docker-compose.yml # spec/models/account_spec.rb
- Loading branch information
Showing
1,205 changed files
with
20,136 additions
and
11,525 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| name: Deployment troubleshooting | ||
| description: | | ||
| You are a server administrator and you are encountering a technical issue during installation, upgrade or operations of Mastodon. | ||
| labels: ['status/to triage'] | ||
| type: 'Troubleshooting' | ||
| body: | ||
| - type: markdown | ||
| attributes: | ||
| value: | | ||
| Make sure that you are submitting a new bug that was not previously reported or already fixed. | ||
| Please use a concise and distinct title for the issue. | ||
| - type: textarea | ||
| attributes: | ||
| label: Steps to reproduce the problem | ||
| description: What were you trying to do? | ||
| value: | | ||
| 1. | ||
| 2. | ||
| 3. | ||
| ... | ||
| validations: | ||
| required: true | ||
| - type: input | ||
| attributes: | ||
| label: Expected behaviour | ||
| description: What should have happened? | ||
| validations: | ||
| required: true | ||
| - type: input | ||
| attributes: | ||
| label: Actual behaviour | ||
| description: What happened? | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| attributes: | ||
| label: Detailed description | ||
| validations: | ||
| required: false | ||
| - type: input | ||
| attributes: | ||
| label: Mastodon instance | ||
| description: The address of the Mastodon instance where you experienced the issue | ||
| placeholder: mastodon.social | ||
| validations: | ||
| required: true | ||
| - type: input | ||
| attributes: | ||
| label: Mastodon version | ||
| description: | | ||
| This is displayed at the bottom of the About page, eg. `v4.4.0-alpha.1` | ||
| placeholder: v4.3.0 | ||
| validations: | ||
| required: false | ||
| - type: textarea | ||
| attributes: | ||
| label: Environment | ||
| description: | | ||
| Details about your environment, like how Mastodon is deployed, if containers are used, version numbers, etc. | ||
| value: | | ||
| Please at least include those informations: | ||
| - Operating system: (eg. Ubuntu 22.04) | ||
| - Ruby version: (from `ruby --version`, eg. v3.3.5) | ||
| - Node.js version: (from `node --version`, eg. v20.18.0) | ||
| validations: | ||
| required: false | ||
| - type: textarea | ||
| attributes: | ||
| label: Technical details | ||
| description: | | ||
| Any additional technical details you may have, like logs or error traces | ||
| validations: | ||
| required: false |
2 changes: 1 addition & 1 deletion
2
.github/ISSUE_TEMPLATE/3.feature_request.yml → .github/ISSUE_TEMPLATE/4.feature_request.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| name: Crowdin / Download translations (stable branches) | ||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: write | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| download-translations-stable: | ||
| runs-on: ubuntu-latest | ||
| if: github.repository == 'mastodon/mastodon' | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Increase Git http.postBuffer | ||
| # This is needed due to a bug in Ubuntu's cURL version? | ||
| # See https://github.com/orgs/community/discussions/55820 | ||
| run: | | ||
| git config --global http.version HTTP/1.1 | ||
| git config --global http.postBuffer 157286400 | ||
| # Download the translation files from Crowdin | ||
| - name: crowdin action | ||
| uses: crowdin/github-action@v2 | ||
| with: | ||
| upload_sources: false | ||
| upload_translations: false | ||
| download_translations: true | ||
| crowdin_branch_name: ${{ github.base_ref || github.ref_name }} | ||
| push_translations: false | ||
| create_pull_request: false | ||
| env: | ||
| CROWDIN_PROJECT_ID: ${{ vars.CROWDIN_PROJECT_ID }} | ||
| CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} | ||
|
|
||
| # As the files are extracted from a Docker container, they belong to root:root | ||
| # We need to fix this before the next steps | ||
| - name: Fix file permissions | ||
| run: sudo chown -R runner:docker . | ||
|
|
||
| # This is needed to run the normalize step | ||
| - name: Set up Ruby environment | ||
| uses: ./.github/actions/setup-ruby | ||
|
|
||
| - name: Run i18n normalize task | ||
| run: bundle exec i18n-tasks normalize | ||
|
|
||
| # Create or update the pull request | ||
| - name: Create Pull Request | ||
| uses: peter-evans/create-pull-request@v7.0.5 | ||
| with: | ||
| commit-message: 'New Crowdin translations' | ||
| title: 'New Crowdin Translations for ${{ github.base_ref || github.ref_name }} (automated)' | ||
| author: 'GitHub Actions <noreply@github.com>' | ||
| body: | | ||
| New Crowdin translations, automated with GitHub Actions | ||
| See `.github/workflows/crowdin-download.yml` | ||
| This PR will be updated every day with new translations. | ||
| Due to a limitation in GitHub Actions, checks are not running on this PR without manual action. | ||
| If you want to run the checks, then close and re-open it. | ||
| branch: i18n/crowdin/translations-${{ github.base_ref || github.ref_name }} | ||
| base: ${{ github.base_ref || github.ref_name }} | ||
| labels: i18n |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,8 @@ jobs: | |
| postgres: | ||
| - 14-alpine | ||
| - 15-alpine | ||
| - 16-alpine | ||
| - 17-alpine | ||
|
|
||
| services: | ||
| postgres: | ||
|
|
||
Oops, something went wrong.