Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream changes up to c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0 #2834

Merged
merged 27 commits into from
Sep 3, 2024
Merged

Merge upstream changes up to c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0 #2834

merged 27 commits into from
Sep 3, 2024

Commits on Sep 3, 2024

  1. Fix radio buttons styling in web UI (mastodon#31723)

    @ClearlyClaire
    ClearlyClaire authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    0437dd9 View commit details
    Browse the repository at this point in the history

  2. Convert tags controller spec to system and request specs (mastodon#… 

    …31708)
    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    219458d View commit details
    Browse the repository at this point in the history

  3. Remove un-needed edge case sort condition in languages helper (mastod… 

    …on#31724)
    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    c9641c8 View commit details
    Browse the repository at this point in the history

  4. Add GET /api/v2_alpha/notifications/:group_key/accounts (mastodon#3… 

    …1725)
    @ClearlyClaire
    ClearlyClaire authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    ea0d691 View commit details
    Browse the repository at this point in the history

  5. Update dependency rspec-rails to v7.0.1 (mastodon#31695) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    97bb8df View commit details
    Browse the repository at this point in the history

  6. Fix spacing between icons and labels in settings/admin interface (mas… 

    …todon#31728)
    @ClearlyClaire
    ClearlyClaire authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    ae363f0 View commit details
    Browse the repository at this point in the history

  7. Remove usage of assigns in controller specs (mastodon#30195)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    5b595b8 View commit details
    Browse the repository at this point in the history

  8. Disable without_verify_partial_doubles in statuses/show view spec (m… 

    …astodon#29132)
    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    79b1841 View commit details
    Browse the repository at this point in the history

  9. Remove fuubar gem and custom rspec --format setting (mastodon#30594)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    dc2f67f View commit details
    Browse the repository at this point in the history

  10. Pull out https/hostname setup for request specs to shared config (mas… 

    …todon#31622)
    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    ef4920c View commit details
    Browse the repository at this point in the history

  11. Convert admin/settings controller specs to system specs (mastodon#3… 

    …1548)
    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    928390c View commit details
    Browse the repository at this point in the history

  12. Improve coverage specificity for Webhook enable/disable/secret specs (m… 

    …astodon#31194)
    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    fcb83be View commit details
    Browse the repository at this point in the history

  13. Simplify account model username presence validation spec (mastodon#31013 

    )
    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    67faaf5 View commit details
    Browse the repository at this point in the history

  14. Fix RSpec/LetSetup cop in api/v1/timelines/tag spec (mastodon#30796)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    8922786 View commit details
    Browse the repository at this point in the history

  15. Fix Rails/ReversibleMigration cop for remove_index (mastodon#30832)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    4682804 View commit details
    Browse the repository at this point in the history

  16. Add coverage for StatusesHelper#media_summary method (mastodon#31726)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    490bdb7 View commit details
    Browse the repository at this point in the history

  17. Add have_cacheable_headers matcher for responses (mastodon#31727)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    e1fa456 View commit details
    Browse the repository at this point in the history

  18. Add coverage for CLI::Accounts#fix_duplications task (mastodon#30639)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    2f0d0fc View commit details
    Browse the repository at this point in the history

  19. Add Reviewable model concern (mastodon#31152)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    7c26e5e View commit details
    Browse the repository at this point in the history

  20. Only enable chewy in search-tagged specs (mastodon#30583)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    69dbc23 View commit details
    Browse the repository at this point in the history

  21. Skip paperclip spoof detector unless opted into attachment processing… 

    … specs (mastodon#31454)
    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    19849eb View commit details
    Browse the repository at this point in the history

  22. frequentlyUsedLanguages not updated correctly (mastodon#31386)

    @c960657
    c960657 authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    8adf67f View commit details
    Browse the repository at this point in the history

  23. Refresh Heroku related thingy for heroku-24 stack (mastodon#31135)

    @zunda
    zunda authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    8c928fa View commit details
    Browse the repository at this point in the history

  24. Add coverage for api/v1/annual_reports area (mastodon#31730)

    @mjankowski
    mjankowski authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    c9ea91f View commit details
    Browse the repository at this point in the history

  25. Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-s… 

    …oc/merge-upstream

Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
    @ClearlyClaire
    ClearlyClaire committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    fef055d View commit details
    Browse the repository at this point in the history

  26. [Glitch] Fix radio buttons styling in web UI 

    Port 0437dd9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
    @ClearlyClaire
    ClearlyClaire committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    663cebb View commit details
    Browse the repository at this point in the history

  27. [Glitch] frequentlyUsedLanguages not updated correctly 

    Port 8adf67f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
    @c960657 @ClearlyClaire
    c960657 authored and ClearlyClaire committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    8e3c47a View commit details
    Browse the repository at this point in the history