Merge pull request #2339 from ClearlyClaire/glitch-soc/merge-upstream

* Cleanup unused portions of statuses/status partial (mastodon#26045) * Wrong count in response when removing favourite/reblog (mastodon#24365) Co-authored-by: Claire <[email protected]> * Paperclip: add support for Azure blob storage (mastodon#23607) * Fix a missing redirection on getting-started in multi column mode (mastodon#26070) * Fix haml-lint Rubocop `Style/NumericPredicate` cop (mastodon#26040) * Change casing for 'Server Settings' string (mastodon#26011) * Move localized subject mailer shared example to separate file (mastodon#25889) * Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (mastodon#26039) * Fix `Lint/Void` cop (mastodon#25922) * Add stricter protocol fields validation for accounts (mastodon#25937) * Improve the bug report templates (mastodon#25621) * Fix the crossorigin attribute (mastodon#26096) * Fix replica being used even if not explicitly defined (mastodon#26074) * Clean up unused application records (mastodon#24871) * Change thread view to scroll to the selected post rather than the post being replied to (mastodon#24685) * Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (mastodon#26023) * change focus ui for keyboard only input (mastodon#25935) * Use username as display name for suspended users or users with blank display names (mastodon#25276) * Fix CSP headers being unintendedly wide (mastodon#26105) * Fix linting issue (mastodon#26106) * Replace 'favourite' by 'favorite' for American English (mastodon#26009) * Override default Action Mailer `preview_path` (mastodon#26110) * Favourits -> Favorites (mastodon#26109) * Bump version to v4.1.5 (mastodon#26108) * Fix incorrect connect timeout in outgoing requests (mastodon#26116) * Fix missing translation strings for importing lists (mastodon#26120) * Use valid email address for first account (mastodon#26114) * Update haml-lint 0.49.1 (mastodon#26118) * Fix focus and hover styles in web UI (mastodon#26125) * Remove back button from bookmarks, favourites and lists screens in web UI (mastodon#26126) * Remove 16:9 cropping from web UI (mastodon#26132) * Change design of link previews in web UI (mastodon#26136) * change poll form element colors to fit with the rest of the ui (mastodon#26139) * Add `lang` attribute to trending links (mastodon#26111) * Update dependency rdf-normalize to v0.6.1 (mastodon#26130) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency brakeman to v6.0.1 (mastodon#26141) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency postcss to v8.4.27 (mastodon#26144) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix unexpected redirection to /explore after sign-in (mastodon#26143) * Update dependency aws-sdk-s3 to v1.131.0 (mastodon#26145) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add report.updated webhook (mastodon#24211) * Fix LinkCrawlWorker crashing on `null` `created_at` (mastodon#26151) * Fix UI Overlap with the loupe icon in the Explore Tab (mastodon#26113) * Fix missing border on error screen in light theme in web UI (mastodon#26152) * Fix missing action label on sensitive videos and embeds in web UI (mastodon#26135) * Fix `lang` for UI texts in link preview (mastodon#26149) * Add published date and author to news on the explore screen in web UI (mastodon#26155) * Coverage for `Auth::OmniauthCallbacks` controller (mastodon#26147) * fix poll input active style (mastodon#26162) * Add `published_at` attribute to preview cards (mastodon#26153) * Update dependency sass to v1.64.1 (mastodon#26146) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Revert poll colors to green outside of compose form (mastodon#26164) * Preserve translation on status re-import (mastodon#26168) * Fix missing GIF badge in account gallery (mastodon#26166) * Reformat large text arg in `FetchLinkCardService` spec (mastodon#26183) * Ignore long line in regex initializer (mastodon#26182) * Reformat large key values in service specs (mastodon#26181) * Reformat large hash in `ContextHelper` module (mastodon#26180) * Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration (mastodon#26178) * Extract private methods in `StatusCacheHydrator` (mastodon#26177) * New Crowdin Translations (automated) (mastodon#26072) Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Claire <[email protected]> * Remove the `sr` locale override .rb files (mastodon#25927) * Use correct naming on controller concern specs (mastodon#26197) * Migrate to request specs in `/api/v2/filters` (mastodon#25721) * Fix wrong filters sometimes applying in streaming (mastodon#26159) * Refactor streaming's filtering logic & improve documentation (mastodon#26213) * Add role badges to the WebUI (mastodon#25649) * Change interaction modal in web UI (mastodon#26075) Co-authored-by: Eugen Rochko <[email protected]> * Fix crash when processing Flag activity with no status (mastodon#26189) * Storage: add :azure to remaining callers (mastodon#26080) * Remove queued_at value from pubsub payloads (mastodon#26173) * Fix emoji picker button scrolling with textarea content in single-column view (mastodon#25304) * Change the wording of the dismissable explore prompt (mastodon#25917) * Update dependency haml_lint to v0.49.2 (mastodon#26222) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix: Streaming server memory leak in HTTP EventSource cleanup (mastodon#26228) * Swap debug statements in streaming server (mastodon#26231) * Fix missing return values in streaming (mastodon#26233) * [Glitch] Wrong count in response when removing favourite/reblog Port 4c18928 to glitch-soc Co-authored-by: Claire <[email protected]> Signed-off-by: Claire <[email protected]> * [Glitch] Fix a missing redirection on getting-started in multi column mode Port 586b1c9 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Change thread view to scroll to the selected post rather than the post being replied to Port e4ea80d to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Replace 'favourite' by 'favorite' for American English Port 217ef7f to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] change poll form element colors to fit with the rest of the ui Port 80809ef to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Add `lang` attribute to trending links Port 76fce34 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Fix UI Overlap with the loupe icon in the Explore Tab Port 9a567ec to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Fix missing border on error screen in light theme in web UI Port d1a9f60 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Fix missing action label on sensitive videos and embeds in web UI Port 714a206 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] fix poll input active style Port 49d2e89 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Revert poll colors to green outside of compose form Port ce1f35d to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Add published date and author to news on the explore screen in web UI Port f826a95 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Preserve translation on status re-import Port 6781dc6 to glitch-soc Signed-off-by: Claire <[email protected]> * [Glitch] Fix missing GIF badge in account gallery Port a4b69be to glitch-soc Signed-off-by: Claire <[email protected]> * Fix interaction modal being broken because of glitch-soc's theming system * [Glitch] Change interaction modal in web UI Port b4e739f to glitch-soc Co-authored-by: Eugen Rochko <[email protected]> Signed-off-by: Claire <[email protected]> * [Glitch] Change the wording of the dismissable explore prompt Port a4ec187 to glitch-soc Signed-off-by: Claire <[email protected]> * Fix CSP tests in glitch-soc --------- Signed-off-by: Claire <[email protected]> Co-authored-by: Matt Jankowski <[email protected]> Co-authored-by: Christian Schmidt <[email protected]> Co-authored-by: Misty De Méo <[email protected]> Co-authored-by: Stanislas Signoud <[email protected]> Co-authored-by: gunchleoc <[email protected]> Co-authored-by: Renaud Chaput <[email protected]> Co-authored-by: Trevor Wolf <[email protected]> Co-authored-by: наб <[email protected]> Co-authored-by: mogaminsk <[email protected]> Co-authored-by: Nick Schonning <[email protected]> Co-authored-by: Eugen Rochko <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vyr Cossont <[email protected]> Co-authored-by: gol-cha <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Daniel M Brasil <[email protected]> Co-authored-by: Emelia Smith <[email protected]>
glitch-soc · Jul 30, 2023 · e96a904 · e96a904
2 parents ebfa184 + 73a3228
commit e96a904
Show file tree

Hide file tree

Showing 556 changed files with 7,130 additions and 4,787 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yml b/.github/ISSUE_TEMPLATE/1.bug_report.yml
diff --git a/.github/ISSUE_TEMPLATE/1.web_bug_report.yml b/.github/ISSUE_TEMPLATE/1.web_bug_report.yml
@@ -0,0 +1,76 @@
+name: Bug Report (Web Interface)
+description: If you are using Mastodon's web interface and something is not working as expected
+labels: [bug, 'status/to triage', 'area/web interface']
+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.1.2+nightly-20230627`
+      placeholder: v4.1.2
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Browser name and version
+      description: |
+        What browser are you using when getting this bug? Please specify the version as well.
+      placeholder: Firefox 105.0.3
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system
+      description: |
+        What OS are you running? Please specify the version as well.
+      placeholder: macOS 13.4.1
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Technical details
+      description: |
+        Any additional technical details you may have. This can include the full error log, inspector's output…
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml b/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
@@ -0,0 +1,65 @@
+name: Bug Report (server / API)
+description: |
+  If something is not working as expected, but is not from using the web interface.
+labels: [bug, 'status/to triage']
+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: false
+  - type: input
+    attributes:
+      label: Mastodon version
+      description: |
+        This is displayed at the bottom of the About page, eg. `v4.1.2+nightly-20230627`
+      placeholder: v4.1.2
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Technical details
+      description: |
+        Any additional technical details you may have, like logs or error traces
+      value: |
+        If this is happening on your own Mastodon server, please fill out those:
+        - Ruby version: (from `ruby --version`, eg. v3.1.2)
+        - Node.js version: (from `node --version`, eg. v18.16.0)
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.yml → .github/ISSUE_TEMPLATE/3.feature_request.yml b/.github/ISSUE_TEMPLATE/2.feature_request.yml → .github/ISSUE_TEMPLATE/3.feature_request.yml
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
@@ -107,6 +107,10 @@ jobs:
       PAM_ENABLED: true
       PAM_DEFAULT_SERVICE: pam_test
       PAM_CONTROLLED_SERVICE: pam_test_controlled
+      OIDC_ENABLED: true
+      OIDC_SCOPE: read
+      SAML_ENABLED: true
+      CAS_ENABLED: true
       BUNDLE_WITH: 'pam_authentication test'
       CI_JOBS: ${{ matrix.ci_job }}/4
 

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
@@ -1,21 +1,21 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2023-07-18 11:56:05 -0400 using Haml-Lint version 0.48.0.
+# on 2023-07-20 09:47:50 -0400 using Haml-Lint version 0.48.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of Haml-Lint, may require this file to be generated again.
 
 linters:
-  # Offense count: 959
+  # Offense count: 951
   LineLength:
     enabled: false
 
   # Offense count: 22
   UnnecessaryStringOutput:
     enabled: false
 
-  # Offense count: 63
+  # Offense count: 57
   RuboCop:
     enabled: false
 
@@ -26,7 +26,7 @@ linters:
       - 'app/views/admin/reports/show.html.haml'
       - 'app/views/disputes/strikes/show.html.haml'
 
-  # Offense count: 40
+  # Offense count: 32
   InstanceVariables:
     exclude:
       - 'app/views/admin/reports/_actions.html.haml'
@@ -38,7 +38,6 @@ linters:
       - 'app/views/invites/_form.html.haml'
       - 'app/views/relationships/_account.html.haml'
       - 'app/views/shared/_og.html.haml'
-      - 'app/views/statuses/_status.html.haml'
 
   # Offense count: 3
   IdNames:

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -131,12 +131,6 @@ RSpec/FilePath:
   Exclude:
     - 'spec/config/initializers/rack_attack_spec.rb' # namespaces usually have separate folder
     - 'spec/lib/sanitize_config_spec.rb' # namespaces usually have separate folder
-    - 'spec/controllers/concerns/account_controller_concern_spec.rb' # Concerns describe ApplicationController and don't fit naming
-    - 'spec/controllers/concerns/export_controller_concern_spec.rb'
-    - 'spec/controllers/concerns/localized_spec.rb'
-    - 'spec/controllers/concerns/rate_limit_headers_spec.rb'
-    - 'spec/controllers/concerns/signature_verification_spec.rb'
-    - 'spec/controllers/concerns/user_tracking_concern_spec.rb'
 
 # Reason:
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecnamedsubject

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -127,12 +127,6 @@ Lint/UselessAssignment:
     - 'spec/services/resolve_url_service_spec.rb'
     - 'spec/views/statuses/show.html.haml_spec.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: CheckForMethodsWithNoSideEffects.
-Lint/Void:
-  Exclude:
-    - 'spec/services/resolve_account_service_spec.rb'
-
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 150
@@ -152,13 +146,6 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 27
 
-# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Naming/FileName:
-  Exclude:
-    - 'config/locales/sr-Latn.rb'
-
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
 # AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
@@ -287,7 +274,6 @@ RSpec/LetSetup:
     - 'spec/controllers/api/v2/admin/accounts_controller_spec.rb'
     - 'spec/controllers/api/v2/filters/keywords_controller_spec.rb'
     - 'spec/controllers/api/v2/filters/statuses_controller_spec.rb'
-    - 'spec/controllers/api/v2/filters_controller_spec.rb'
     - 'spec/controllers/auth/confirmations_controller_spec.rb'
     - 'spec/controllers/auth/passwords_controller_spec.rb'
     - 'spec/controllers/auth/sessions_controller_spec.rb'
@@ -297,6 +283,7 @@ RSpec/LetSetup:
     - 'spec/controllers/oauth/tokens_controller_spec.rb'
     - 'spec/controllers/settings/imports_controller_spec.rb'
     - 'spec/lib/activitypub/activity/delete_spec.rb'
+    - 'spec/lib/vacuum/applications_vacuum_spec.rb'
     - 'spec/lib/vacuum/preview_cards_vacuum_spec.rb'
     - 'spec/models/account_spec.rb'
     - 'spec/models/account_statuses_cleanup_policy_spec.rb'
@@ -841,8 +828,6 @@ Style/RedundantConstantBase:
   Exclude:
     - 'config/environments/production.rb'
     - 'config/initializers/sidekiq.rb'
-    - 'config/locales/sr-Latn.rb'
-    - 'config/locales/sr.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SafeForConstants.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.1.5] - 2023-07-21
+
+### Added
+
+- Add check preventing Sidekiq workers from running with Makara configured ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25850))
+
+### Changed
+
+- Change request timeout handling to use a longer deadline ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26055))
+
+### Fixed
+
+- Fix moderation interface for remote instances with a .zip TLD ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25885))
+- Fix remote accounts being possibly persisted to database with incomplete protocol values ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25886))
+- Fix trending publishers table not rendering correctly on narrow screens ([vmstan](https://github.com/mastodon/mastodon/pull/25945))
+
+### Security
+
+- Fix CSP headers being unintentionally wide ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26105))
+
 ## [4.1.4] - 2023-07-07
 
 ### Fixed

diff --git a/Gemfile b/Gemfile
@@ -18,6 +18,7 @@ gem 'aws-sdk-s3', '~> 1.123', require: false
 gem 'fog-core', '<= 2.4.0'
 gem 'fog-openstack', '~> 0.3', require: false
 gem 'kt-paperclip', '~> 7.2'
+gem 'md-paperclip-azure', '~> 2.2', require: false
 gem 'blurhash', '~> 0.1'
 
 gem 'active_model_serializers', '~> 0.10'