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.

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

Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop #24698

Merged
merged 3 commits into from Jun 14, 2023

Conversation

mjankowski
Copy link
Contributor

Fixes the failures from here - #24641 - by following the advice of the IndexedLet cop, added in version 2.20.0.

@nschonni
Copy link
Contributor

I'm going to rebase my ignores for this out of #24469, but you might want to run bundle exec rubocop --regen-todo since I think there was just one other minor comment change that was added in the release that I saw in e922465

@mjankowski
Copy link
Contributor Author

Thanks, re-ran the todo generator.

@renchap renchap added ruby Pull requests that update Ruby code lint fix 💅 labels May 3, 2023
@github-actions
Copy link
Contributor

github-actions bot commented May 4, 2023

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions
Copy link
Contributor

github-actions bot commented May 4, 2023

This pull request has resolved merge conflicts and is ready for review.

@nschonni
Copy link
Contributor

nschonni commented May 9, 2023

Looks like there is a 2.22.0 out now. Don't think their will be any more code changes, but probably good to rebase this one with the extra bump

@mjankowski
Copy link
Contributor Author

Looks like there is a 2.22.0 out now. Don't think their will be any more code changes, but probably good to rebase this one with the extra bump

Rebased from main and bumped to 2.22.0 in this PR.

You were correct that there are no additional rule changes to handle with the update beyond what was already here for the 2.20.0 bump.

@nschonni
Copy link
Contributor

nschonni commented May 9, 2023

Nice, may make sense to update the PR title too

@mjankowski mjankowski changed the title Update rubocop-rspec to version 2.20.0, fix RSpec/IndexedLet cop Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop May 9, 2023
@mjankowski
Copy link
Contributor Author

It just might.

@github-actions
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions
Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

@github-actions
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions
Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

@github-actions
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@mjankowski
Copy link
Contributor Author

How should we approach this?

I could write a whole essay on this, but to attempt to summarize:

  • For this particular PR what I had actually noticed was that the dependabot update failed, and I saw in the CI logs what the failure was (the IndexedLet rule), and it seemed easy enough to fix so I just did it in this branch and opened the PR. Did not think too hard about the rule itself or excluding it instead of fixing it. If it had been much much more substantial I probably would have either not bothered, or would have kept working on all the other ones first and come back to it.
  • From an "if we're going to keep doing updates and opting in by default to all the new rules, what's the best way to handle that?" angle, I think it's fine to just take it case by case. Have the default be that we'll opt-in, accept that this will produce the occassional large diff, large-churn PRs, and just live with it. In cases where someone hates a rule or it's just too disruptive to pull in all at once, exclude it instead of fixing it.
  • Higher level - I'm pretty strongly of the opinion that it's simultaneously a) useful and nice to have a consistent encorced style (hence all my recent PRs along these lines), b) generally speaking a really bad use of time to have to think about and debate and litigate every new rule that comes up or changing/managing the config prefs more than a few times a year. On most of my professional projects we've taken the approach of "outsourcing" this work of contemplating new changes and opting in/out of the full rubocop stack to the standardrb linter (sits on top of rubocop) to just let all the bike shedding happen there instead of in our actual projects. This is typically jarring to people at first because there's at least one thing you disagree with ... but after a few weeks/months it feels totally normal and does tend to successfully reduce that amount of bike shedding conversation so focus can be on the actual project. I could open a proof of concept PR to show what this would look like if interested.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

This pull request has resolved merge conflicts and is ready for review.

@mjankowski mjankowski changed the title Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop Jun 6, 2023
@github-actions
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions
Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

@github-actions
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions
Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

@ClearlyClaire ClearlyClaire merged commit 4c5aa0e into mastodon:main Jun 14, 2023
28 checks passed
@mjankowski mjankowski deleted the update-rubocop-rspec branch June 14, 2023 15:37
skerit pushed a commit to 11ways/mastodon that referenced this pull request Jul 7, 2023
vitunvuohi added a commit to meemudotorg/mastodon that referenced this pull request Jul 8, 2023
* Fix `RSpec/DescribedClass` cop (mastodon#25104)

* Update dependency redis to v4.6.7 (mastodon#25300)

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

* Autofix Rubocop Regex Style rules (mastodon#23690)

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

* Fix `RSpec/DescribedClass` cop missed items (mastodon#25309)

* Fix RSpec/MissingExampleGroupArgument cop (mastodon#25310)

* Configure RenovateBot to add proper language labels (mastodon#25316)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>

* Change design of dropdowns in web UI (mastodon#25107)

* Add `legal` as report category (mastodon#23941)

* Fix compatibility of recent migration with PostgreSQL 10 (mastodon#25324)

* Update dependency sass-loader to v10.4.1 (mastodon#25315)

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

* Update dependency dotenv to v16.1.3 (mastodon#25302)

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

* Update dependency webpack-bundle-analyzer to v4.9.0 (mastodon#25327)

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

* Remove reference to deleted statsd config file (mastodon#25336)

* Fix translations for changing theme  (mastodon#25340)

* Migrate to request specs in `/api/v1/admin/email_domain_blocks` (mastodon#25337)

* Remove unused `redis_info` method Admin::Dashboard (mastodon#25345)

* Add Ruby & Bundler versions to Gemfile.lock (mastodon#25317)

* Fix performance of streaming by parsing message JSON once (mastodon#25278)

* Add time zone preference (mastodon#25342)

* [Glitch] Upgrade react-intl

Port 44cd88a to glitch-soc

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

* [Glitch] Translate CW, poll options and media descriptions

Port 6905746 to glitch-soc

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

* [Glitch] Fix prev/next buttons color in media viewer

Port 675672f to glitch-soc

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

* [Glitch] Add a confirmation screen when suspending a domain

Port e9385e9 to glitch-soc

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

* [Glitch] Fix using Date.now() instead of intl.now()

Port b3f9a0d to glitch-soc

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

* [Glitch] Fix `/share` and cleanup and reorganize frontend locale loading

Port b0780cf to glitch-soc

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

* [Glitch] Fix spacing of middle dots in the detailed status meta section

Port acc419b to glitch-soc

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

* [Glitch] Add card with who invited you to join when displaying rules on sign-up

Port SCSS from 0766c9a to glitch-soc

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

* [Glitch] Add exclusive lists

Port bacb674 to glitch-soc

Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix design issues with recent react-intl upgrade

Port c2c3961 to glitch-soc

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

* [Glitch] Fix not shown announcements in hometimeline.

Port a6c898f to glitch-soc

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

* [Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /

Port 1483a3d to glitch-soc

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

* [Glitch] Rewrite `<LoadMore />` as FC and TS

Port fb5bf5c to glitch-soc

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

* [Glitch] Change design of dropdowns in web UI

Port e4fd950 to glitch-soc

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

* Switch to using a `common` runtime chunk rather than `locales`

* Fix logging of messages that are binary before closing their connection (mastodon#25361)

* Disable paperclip processing in specs (mastodon#25359)

* Use `build` where possible in fabricators (mastodon#25360)

* Migrate to request specs in `/api/v1/admin/reports` (mastodon#25355)

* Migrate to request specs in `/api/v1/admin/domain_blocks` (mastodon#25335)

* Migrate to request specs in `/api/v1/admin/domain_allows` (mastodon#25333)

* Migrate to request specs in `/api/v1/admin/ip_blocks` (mastodon#25331)

* Migrate to request specs in `/api/v1/admin/canonical_email_blocks` (mastodon#25330)

* migrate test for `GET /api/v1/accounts/{account_id}` to request spec (mastodon#25322)

* Add logging of websocket send errors (mastodon#25280)

* Add coverage for `CLI::Cache` command (mastodon#25238)

* Add coverage for `CLI::Feeds` command (mastodon#25319)

* Reduce `RSpec/MultipleExpectations` cop max to 8 (mastodon#25313)

* Fix some translation strings inconsistencies

* Change "bot" label to "automated" (mastodon#25356)

* Rewrite <LoadPending /> as FC and TS (mastodon#25363)

* [Glitch] Change "direct message" nomenclature to "private mention" in web UI (mastodon#2158)

Port 68a192e to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add unsubscribe link to e-mails (mastodon#25378)

* Enable paperclip for account attachment examples (mastodon#25381)

* Remove unused shared examples for scoped settings (mastodon#25389)

* Add missing report category translation (mastodon#25400)

* Update Rubocop 1.52.1 (mastodon#25376)

* Rewrite `<LoadingIndicator/>` as FC and TS  (mastodon#25364)

* Rewrite `emoji_mart_data_light` as TS (mastodon#25138)

* Fix CAPTCHA page not following design pattern of sign-up flow (mastodon#25395)

* Change edit profile page (mastodon#25413)

* Fix ArgumentError when loading newer Private Mentions (mastodon#25399)

* Fix always redirecting to onboarding in web UI (mastodon#25396)

* Update dependency aws-sdk-s3 to v1.124.0 (mastodon#25297)

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

* Update dependency capybara to v3.39.2 (mastodon#25407)

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

* Update babel monorepo to v7.22.5 (mastodon#25405)

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

* Extract shared examples from api specs (mastodon#25387)

* Migrate to request specs in `/api/v1/apps` (mastodon#25401)

* Migrate to request specs in `/api/v1/apps/verify_credentials` (mastodon#25404)

* Speed improvement for `AccountsStatusesCleanupScheduler` spec (mastodon#25406)

* Reduce factory data created in spec/models/trends/statuses spec (mastodon#25410)

* Update dependency glob to v10.2.7 (mastodon#25417)

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

* Update formatjs monorepo (mastodon#25418)

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

* Update dependency redis-namespace to v1.11.0 (mastodon#25421)

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

* Update dependency sass to v1.63.3 (mastodon#25422)

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

* Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` (mastodon#25386)

* Migrate to request specs in `/api/v1/follow_requests` (mastodon#25411)

* Migrate to request specs in `/api/v1/domain_blocks` (mastodon#25414)

* Update rubocop-rspec to version 2.22.0, fix `RSpec/IndexedLet` cop (mastodon#24698)

* Update devDependencies (non-major) (mastodon#25427)

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

* Update libretranslate/libretranslate Docker tag to v1.3.11 (mastodon#25428)

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

* Update dependency core-js to v3.31.0 (mastodon#25430)

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

* Update dependency intl-messageformat to v10.5.0 (mastodon#25431)

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

* Lock file maintenance (mastodon#25434)

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

* Migrate to request specs in `/api/v1/lists` (mastodon#25443)

* Update dependency better_errors to v2.10.1 (mastodon#25445)

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

* Remove Ruby GC config from spec helper (mastodon#25455)

* Fix non-interactive upload container being given a `button` role and tabIndex (mastodon#25462)

* Update dependency aws-sdk-s3 to v1.125.0 (mastodon#25458)

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

* [Glitch] Change "bot" label to "automated"

Port 432a5d2 to glitch-soc

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

* [Glitch] Rewrite <LoadPending /> as FC and TS

Port dfaf59d to glitch-soc

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

* [Glitch] Add missing report category translation

Port 1cb4514 to glitch-soc

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

* [Glitch] Rewrite `<LoadingIndicator/>` as FC and TS (mastodon#25364)

Port a86886b to glitch-soc

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

* [Glitch] Rewrite `emoji_mart_data_light` as TS

Port 3b5e302 to glitch-soc

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

* [Glitch] Fix CAPTCHA page not following design pattern of sign-up flow

Port 39110d1 to glitch-soc

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

* Fix glitch-soc-only test being broken by refactor of the surrounding tests

* [Glitch] Fix non-interactive upload container being given a `button` role and tabIndex

Port c9d06d1 to glitch-soc

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

* Fix cross-origin loading of locales (mastodon#25498)

* Migrate to request specs in `/api/v1/tags` (mastodon#25439)

* Fix incorrect pagination headers in `/api/v2/admin/accounts` (mastodon#25477)

* Update dependency aws-sdk-s3 to v1.126.0 (mastodon#25480)

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

* Remove unused `picture_hint` helper method (mastodon#25485)

* Combine assertions in api/v1/notifications spec (mastodon#25486)

* Add coverage for `UserMailer` methods (mastodon#25484)

* Update dependency dotenv to v16.2.0 (mastodon#25506)

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

* Reduce `sleep` time in request pool spec (mastodon#25470)

* Rewrite `<AutosuggestHashtag />` as FC and TS (mastodon#25481)

* Fix user settings not getting validated (mastodon#25508)

* Re-allow title attribute in <abbr> (mastodon#2254)

* Re-allow title attribute in <abbr>

This was accidentally removed in 7623e18

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add test

Add a new test to check that title attribute on <abbr> is kept.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Prevent UserCleanupScheduler from overwhelming streaming (mastodon#25519)

* Add translate="no" to outgoing mentions and links (mastodon#25524)

* Fix wrong view being displayed when a webhook fails validation (mastodon#25464)

* Migrate to request specs in `/api/v1/admin/account_actions` (mastodon#25514)

* Fix missing validation on `default_privacy` setting (mastodon#25513)

* Fix /api/v1/conversations sometimes returning empty accounts (mastodon#25499)

* Add per-test timeouts to AutoStatusesCleanupScheduler tests (mastodon#24841)

* Change emoji picker icon (mastodon#25479)

* Migrate to request specs in `/api/v1/suggestions` (mastodon#25540)

* Speed-up on `BackupService` spec (mastodon#25527)

* Fix custom signup URL may not loaded (mastodon#25531)

* Speed-up on `StatusesController` spec (mastodon#25549)

* Add finer permission requirements for managing webhooks (mastodon#25463)

* Reduce `Admin::Reports::Actions` spec db activity (mastodon#25465)

* Fix `RSpec/VerifiedDoubles` cop (mastodon#25469)

* Change /api/v1/statuses/:id/history to always return at least one item (mastodon#25510)

* Fix j/k keyboard shortcuts on some status lists (mastodon#25554)

* Use default `bootsnap/setup` in boot.rb (mastodon#25502)

* Add POST /api/v1/conversations/:id/unread (mastodon#25509)

* Add onboarding prompt when home feed too slow in web UI (mastodon#25267)

* Remove unique accounts condition from Home onboarding prompt (mastodon#25556)

* Change labels and styles on the onboarding screen in web UI (mastodon#25559)

* Fix verified badge in account lists potentially including rel="me" links (mastodon#25561)

* [Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS

Port 804488d to glitch-soc

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

* [Glitch] Change emoji picker icon

Port 69db507 to glitch-soc

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

* [Glitch] Fix custom signup URL may not loaded

Port 8d2c268 to glitch-soc

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

* [Glitch] Fix j/k keyboard shortcuts on some status lists

Port a8c1c8b to glitch-soc

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

* [Glitch] Add onboarding prompt when home feed too slow in web UI

Port 00ec439 to glitch-soc

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

* [Glitch] Remove unique accounts condition from Home onboarding prompt

Port 0842a68 to glitch-soc

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

* Fix search not being easily findable on smaller screens in web UI (mastodon#25576)

* Fix onboarding prompt flashing while home feed is loading in web UI (mastodon#25579)

* Change header backgrounds to use fewer different colors in web UI (mastodon#25577)

* Fix compose form not being shown when clicking “Make your first post” on mobile (mastodon#25581)

* Improve dismissable banner buttons when they dont fit on 1 line (mastodon#25580)

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

* Change files to be deleted in batches instead of one-by-one (mastodon#23302)

* Remove media attachment only when file was exist (mastodon#25586)

* Update dependency react-redux to v8.1.1 (mastodon#25432)

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

* Fix batch attachment deletion leaving empty directories (mastodon#25587)

* Update dependency rails to v6.1.7.4 (mastodon#25606)

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

* Update dependency sass to v1.63.6 (mastodon#25607)

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

* Update dependency react-textarea-autosize to v8.5.0 (mastodon#25610)

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

* Update dependency pg-connection-string to v2.6.1 (mastodon#25605)

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

* Update dependency pg to v8.11.1 (mastodon#25604)

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

* Update mcr.microsoft.com/devcontainers/ruby Docker tag to v1 (mastodon#25613)

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

* Update dependency glob to v10.3.0 (mastodon#25608)

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

* Fix suspending an already-limited domain (mastodon#25603)

* [Glitch] Fix search not being easily findable on smaller screens in web UI

Port 2b78c07 to glitch-soc

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

* [Glitch] Fix onboarding prompt flashing while home feed is loading in web UI

Port 65aa046 to glitch-soc

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

* [Glitch] Improve dismissable banner buttons when they dont fit on 1 line

Port ae30a60 to glitch-soc

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

* Remove the search button from UI header when logged out (mastodon#25631)

* Change account search to match by text when opted-in (mastodon#25599)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Fix ResolveURLService not resolving local URLs for remote content (mastodon#25637)

* Remove `pkg-config` gem dependency (mastodon#25615)

* Update Crowdin configuration file

* Fix onboarding prompt being displayed because of disconnection gaps (mastodon#25617)

* Use an Immutable Record as the root state (mastodon#25584)

* Add index to backups on `user_id` column (mastodon#25647)

* Fix rails `rewhere` deprecation warning in directories api controller (mastodon#25625)

* Remove unused routes (mastodon#25578)

* Fixing an issue with a missing argument (mastodon#2261)

undefined

* Update uri to version 0.12.2 (CVE fix) (mastodon#25657)

* Change local and federated timelines to be in a single firehose column (mastodon#25641)

* Fix HTTP 500 in `/api/v1/emails/check_confirmation` (mastodon#25595)

* Rails 7 update (mastodon#24241)

* Change dropdown icon above compose form from ellipsis to bars in web UI (mastodon#25661)

* Prevent duplicate concurrent calls of `/api/*/instance` in web UI (mastodon#25663)

* Revert "Rails 7 update" (mastodon#25667)

* [Glitch] Remove the search button from UI header when logged out

Port 285a691 to glitch-soc

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

* [Glitch] Fix onboarding prompt being displayed because of disconnection gaps

Port 9934949 to glitch-soc

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

* [Glitch] Use an Immutable Record as the root state

Port 78ba12f to glitch-soc

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

* [Glitch] Change local and federated timelines to be in a single firehose column

Port cea9db5 to glitch-soc

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

* [Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI

Port 0512537 to glitch-soc

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

* [Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI

Port 5b46345 to glitch-soc

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

* Fix inefficient query when requesting a new confirmation email from a logged-in account (mastodon#25669)

* Add superapp index on `oauth_applications` (mastodon#25670)

* Add users index on unconfirmed_email (mastodon#25672)

* Show local-only posts in “All” by default, and add back option to toggle it

* Fix showing local only toots in "All" (mastodon#2265)

* Fix warnings about missing dependency in hooks

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add `allowLocalOnly` to timelineId

Without this local-only toots will never be loaded.

feedType is checked to be public to not show local-only toots in the "Remote" tab.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Change button colors to increase hover/focus contrast and consistency (mastodon#25677)

* Add regex filter back to firehose (mastodon#2266)

* Add regex filter back to firehose

The regex filter will apply to all tabs and not be automatically applied when pinned.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Keep regex when pinned

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Fix regression of icon button colors in web UI (mastodon#25679)

* Fix `/api/v2/search` not working with following query param (mastodon#25681)

* Change labels of live feeds tabs in web UI (mastodon#25683)

* Add at-symbol prepended to mention span title (mastodon#25684)

Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>

* Fix local live feeds does not expand (mastodon#25694)

* Fix forgotten unconfirmed_email migration file (mastodon#25702)

* fix read more button overlapping thread line bug (mastodon#25706)

* Fix re-activated accounts being deleted by AccountDeletionWorker (mastodon#25711)

* Fix OAuth apps page crashing when listing apps with certain admin API scopes (mastodon#25713)

* Add button to see results for polls in web UI (mastodon#25726)

* Add canonical link tags in web UI (mastodon#25715)

* [Glitch] Change labels of live feeds tabs in web UI

Port 54a1052 to glitch-soc

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

* [Glitch] Add at-symbol prepended to mention span title

Port d9a5c1a to glitch-soc

Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Fix local live feeds does not expand

Port 6268188 to glitch-soc

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

* [Glitch] Add canonical link tags in web UI

Port 000b835 to glitch-soc

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

* [Glitch] Add button to see results for polls in web UI

Port b7910bc to glitch-soc

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

* [Glitch] Change button colors to increase hover/focus contrast and consistency

Port 54cb679 to glitch-soc

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

* [Glitch] Fix regression of icon button colors in web UI

Port 69e124e to glitch-soc

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

* Add hardened headers to user-uploaded files (mastodon#25756)

* Merge pull request from GHSA-ccm4-vgcc-73hp

* Tighten allowed HTML in oEmbed-based preview cards

* Sanitize preview cards at render time

* Add `sandbox` attribute to preview card iframes

* Merge pull request from GHSA-9928-3cp5-93fm

* Fix attachments getting processed despite failing content-type validation

* Add a restrictive ImageMagick security policy tailored for Mastodon

* Fix misdetection of MP3 files with large cover art

* Reject unprocessable audio/video files instead of keeping them unchanged

* Merge pull request from GHSA-9pxv-6qvf-pjwc

* Fix timeout handling of outbound HTTP requests

* Use CLOCK_MONOTONIC instead of Time.now

* Merge pull request from GHSA-55j9-c3mp-6fcq

* Bump version to v4.1.3 (mastodon#25757)

* Fix incorrect secondary button size (mastodon#2276)

* Fix processing of media files with unusual names (mastodon#25788)

* Update dependency sanitize to v6.0.2 [SECURITY] (mastodon#25777)

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

* Fix typo in CHANGELOG.md (mastodon#25764)

* Fix branding:generate_app_icons failing because of disallowed ICO coder (mastodon#25794)

* Fix crash in admin interface when viewing a remote user with verified links (mastodon#25796)

* Tag images with the latest tag only when running against the latest stable branch (mastodon#25803)

* Bump version to v4.1.4 (mastodon#25805)

* woo

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: jsgoldstein <jakegoldstein95@gmail.com>
Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com>
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
Co-authored-by: S.H <gamelinks007@gmail.com>
Co-authored-by: Jed Fox <git@jedfox.com>
Co-authored-by: Darius Kazemi <darius.kazemi@gmail.com>
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: alfe <alfe10251+github@gmail.com>
Co-authored-by: fusagiko / takayamaki <24884114+takayamaki@users.noreply.github.com>
Co-authored-by: alfe <alfe10251@gmail.com>
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
Co-authored-by: たいち ひ <taichi221228@icloud.com>
Co-authored-by: Ian <ian@devolute.net>
Co-authored-by: mogaminsk <mgmnjp@icloud.com>
Co-authored-by: Vivianne <puttabutta@gmail.com>
Co-authored-by: Trevor Wolf <teeerevor@gmail.com>
Co-authored-by: forsamori <forsamori@yahoo.co.uk>
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
Co-authored-by: nemobis <federicoleva@tiscali.it>
Co-authored-by: m c <458905+goatrocks@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lint fix 💅 ruby Pull requests that update Ruby code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants