Skip to content

Commit

Permalink
Merge upstream (#52)
Browse files Browse the repository at this point in the history
* Remove remnants of embed views (mastodon#32419)

* Use `with_options` blocks in `Associations` concern (mastodon#32840)

* Add OpenTelemetry VCS attributes (mastodon#32904)

* Add missing autofocus on boost modal (mastodon#32953)

* Update libretranslate/libretranslate Docker tag to v1.6.2 (mastodon#32951)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency @formatjs/cli to v6.3.11 (mastodon#32950)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (mastodon#32927)

Co-authored-by: GitHub Actions <noreply@github.com>

* `Form::Import` spec reduce factories (mastodon#32924)

* Reduce long lines in `relationships/show` view (mastodon#32922)

* Extract constants for controller `LIMIT` queries (mastodon#32921)

* Update dependency aws-sdk-s3 to v1.171.0 (mastodon#32901)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Use `nil` instead of `false` for datetime value in spec (mastodon#32926)

* Streaming: add development logging of database queries (mastodon#32945)

* Fix `min_id` and `max_id` causing error in search API (mastodon#32857)

* Move self destruct check to `config_for` and add constant for verifier string (mastodon#32943)

* Change dependency from annotate to annotaterb (mastodon#30232)

* Use hash arguments to `select` when possible (Rails 7.2) (mastodon#32917)

* Use hash arguments to `order` when possible (Rails 7.2) (mastodon#32915)

* Add coverage for fixing the thing with the dates in the search area (mastodon#32958)

* Prep work for coverage addition to `ActivityPub::DeliveryWorker` spec (mastodon#32944)

* Use group/count approach in annual report classes (mastodon#32914)

* DB Replica database_tasks as ENV (mastodon#32908)

* Fix notification polling showing a loading bar in web UI (mastodon#32960)

* Update dependency aws-sdk-s3 to v1.172.0 (mastodon#32964)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (mastodon#32969)

Co-authored-by: GitHub Actions <noreply@github.com>

* Add `LoginActivity` model spec and `BrowserDetection` concern shared example (mastodon#32959)

* Extract `Notification::Groups` concern (mastodon#32968)

* Change lists to reflect added and removed users retroactively (mastodon#32930)

* Use hash arguments to `group` when possible (mastodon#32916)

* Fix error when viewing statuses to deleted replies in moderation view (mastodon#32986)

* Update dependency opentelemetry-instrumentation-rails to '~> 0.33.0' (mastodon#32987)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Add `AccountWarning` case to `Report#history` spec (mastodon#32984)

* New Crowdin Translations (automated) (mastodon#32990)

Co-authored-by: GitHub Actions <noreply@github.com>

* Update dependency json-schema to v5.1.0 (mastodon#32992)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix posts made in the future being allowed to trend (mastodon#32996)

* Add ability to middle-mouse click posts in web UI (mastodon#32988)

* block scheduled status from frozen users (mastodon#30729)

* Fix wrong video dimensions for some rotated videos (mastodon#33008)

* New Crowdin Translations (automated) (mastodon#33010)

Co-authored-by: GitHub Actions <noreply@github.com>

* Update dependency doorkeeper to v5.8.0 (mastodon#33000)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Add stop-gap antispam code (mastodon#32981)

* `rel="me"` check should be case-insenstive (mastodon#32238)

* Change design of lists in web UI (mastodon#32881)

* Fix duplicate notifications in notification groups when using slow mode (mastodon#33014)

* improve nginx.conf by setting gzip_static to on (mastodon#30698)

* LinkDetailsExtractor adjustments (mastodon#31357)

* Fix pushing hashtag-followed posts to feeds of inactive users (mastodon#33018)

* Rely on Rails to enable YJIT when available (mastodon#33017)

* Update Yarn to v4.5.2 (mastodon#33021)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* New Crowdin Translations (automated) (mastodon#33020)

Co-authored-by: GitHub Actions <noreply@github.com>

* Update dependency aws-sdk-s3 to v1.173.0 (mastodon#33019)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* [Glitch] Add missing autofocus on boost modal

Port 60801ab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix notification polling showing a loading bar in web UI

Port e856838 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Set autofocus on favourite modal (glitch-soc#2900)

* New Crowdin Translations (automated) (glitch-soc#2896)

* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix duplicate notifications in notification groups when using slow mode

Port 4bfb888 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Remove pinned accounts editor

It was utterly broken and the underlying modals are getting redesigned

* [Glitch] Change design of lists in web UI

Port 6260350 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Fix issue templates (glitch-soc#2904)

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Andrew W. Lee <wjldrew@gmail.com>
Co-authored-by: Shlee <github@shl.ee>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Paulo Vilarinho <33267902+PauloVilarinho@users.noreply.github.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
Co-authored-by: Joshix-1 <57299889+Joshix-1@users.noreply.github.com>
  • Loading branch information
15 people authored Nov 26, 2024
1 parent c956189 commit 52b903a
Show file tree
Hide file tree
Showing 378 changed files with 5,043 additions and 4,957 deletions.
59 changes: 59 additions & 0 deletions .annotaterb.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
---
:position: before
:position_in_additional_file_patterns: before
:position_in_class: before
:position_in_factory: before
:position_in_fixture: before
:position_in_routes: before
:position_in_serializer: before
:position_in_test: before
:classified_sort: true
:exclude_controllers: true
:exclude_factories: true
:exclude_fixtures: true
:exclude_helpers: true
:exclude_scaffolds: true
:exclude_serializers: true
:exclude_sti_subclasses: true
:exclude_tests: true
:force: false
:format_markdown: false
:format_rdoc: false
:format_yard: false
:frozen: false
:ignore_model_sub_dir: false
:ignore_unknown_models: false
:include_version: false
:show_complete_foreign_keys: false
:show_foreign_keys: false
:show_indexes: false
:simple_indexes: false
:sort: false
:timestamp: false
:trace: false
:with_comment: true
:with_column_comments: true
:with_table_comments: true
:active_admin: false
:command:
:debug: false
:hide_default_column_types: ''
:hide_limit_column_types: 'integer,boolean'
:ignore_columns:
:ignore_routes:
:models: true
:routes: false
:skip_on_db_migrate: false
:target_action: :do_annotations
:wrapper:
:wrapper_close:
:wrapper_open:
:classes_default_to_s: []
:additional_file_patterns: []
:model_dir:
- app/models
:require: []
:root_dir:
- ''

:show_check_constraints: false
2 changes: 1 addition & 1 deletion .devcontainer/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ services:
hard: -1

libretranslate:
image: libretranslate/libretranslate:v1.6.1
image: libretranslate/libretranslate:v1.6.2
restart: unless-stopped
volumes:
- lt-data:/home/libretranslate/.local
Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/1.web_bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Bug Report (Web Interface)
description: There is a problem using Mastodon's web interface.
labels: ['status/to triage', 'area/web interface']
type: Bug
labels: [bug, 'status/to triage', 'area/web interface']
body:
- type: markdown
attributes:
Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/2.server_bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: Bug Report (server / API)
description: |
There is a problem with the HTTP server, REST API, ActivityPub interaction, etc.
labels: ['status/to triage']
type: 'Bug'
labels: [bug, 'status/to triage']
body:
- type: markdown
attributes:
Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/3.troubleshooting.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
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'
labels: [bug, 'status/to triage']
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4.feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Feature Request
description: I have a suggestion
type: Suggestion
labels: [suggestion]
body:
- type: markdown
attributes:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-container-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ jobs:
build-args: |
MASTODON_VERSION_PRERELEASE=${{ inputs.version_prerelease }}
MASTODON_VERSION_METADATA=${{ inputs.version_metadata }}
SOURCE_COMMIT=${{ github.sha }}
platforms: ${{ inputs.platforms }}
provenance: false
builder: ${{ steps.buildx.outputs.name || steps.buildx-native.outputs.name }}
Expand Down
Loading

0 comments on commit 52b903a

Please sign in to comment.