Skip to content

Commit

Permalink
Merge/glitch/20240204 (#80)
Browse files Browse the repository at this point in the history
* Add confirmation when redirecting logged-out requests to permalink (mastodon#27792)

Co-authored-by: Claire <[email protected]>

* chore(deps): update dependency rubocop to v1.60.1 (mastodon#28731)

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

* Fix `Rails/WhereExists` cop in app/lib (mastodon#28862)

* Use active variants for boost icons and increase icon size (mastodon#27924)

* chore(deps): update dependency haml_lint to v0.55.0 (mastodon#28856)

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

* chore(deps): update dependency selenium-webdriver to v4.17.0 (mastodon#28858)

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

* chore(deps): update artifact actions (major) to v4 (major) (mastodon#28415)

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

* fix(deps): update dependency dotenv to v16.4.0 (mastodon#28872)

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

* chore(deps): update dependency chewy to v7.5.0 (mastodon#28730)

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

* Tidy up association declaration in `Instance` model (mastodon#28880)

* Fix process of receiving posts with bearcaps is not working (mastodon#26527)

* Fix redirect confirmation for accounts (mastodon#28902)

* Add tests for redirect confirmations (mastodon#28903)

* Add tests for processing statuses using bearcap URIs (mastodon#28904)

* chore(deps): update dependency rspec-rails to v6.1.1 (mastodon#28905)

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

* fix(deps): update dependency axios to v1.6.6 (mastodon#28895)

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

* Fix remaining `Rails/WhereExists` cop violations, regenerate todo (mastodon#28892)

* fix(deps): update dependency dotenv to v16.4.1 (mastodon#28889)

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

* Add `CustomFilterKeyword#to_regex` method (mastodon#28893)

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

Co-authored-by: GitHub Actions <[email protected]>

* Consolidate db test prep steps to rake task (mastodon#28886)

* Fix `Style/TernaryParentheses` cop (mastodon#28387)

* Reduce factory creation in `spec/models/account_statuses_cleanup_policy` (mastodon#28361)

* Extract helper methods for db connection and table existence check in `CLI::Maintenance` task (mastodon#28281)

* Refactor conversations components in web UI (mastodon#28833)

Co-authored-by: Claire <[email protected]>

* Fix `Style/GuardClause` cop in app/controllers (mastodon#28420)

* Update paperclip and climate_control gems (mastodon#28379)

* Extract `rebuild_index` method in maintenance CLI (mastodon#28911)

* Add specs for `Instance` model scopes and add `with_domain_follows` scope (mastodon#28767)

* [Glitch] Add confirmation when redirecting logged-out requests to permalink

Port SCSS changes from b19ae52 to glitch-soc

Co-authored-by: Claire <[email protected]>
Signed-off-by: Claire <[email protected]>

* [Glitch] Use active variants for boost icons and increase icon size

Port 5a838ce to glitch-soc

Signed-off-by: Claire <[email protected]>

* Fix CSS loading in redirect controller

* [Glitch] Refactor conversations components in web UI (glitch-soc#2589)

Port 3205a65 to glitch-soc

Signed-off-by: Claire <[email protected]>
Co-authored-by: Eugen Rochko <[email protected]>

* Fix crash in private mention conversations in glitch-soc flavor (glitch-soc#2595)

* Remove obsolete locale file (glitch-soc#2596)

* Add github action workflow for manual security builds (mastodon#29040)

* Adapt workflow to glitch-soc

* Fix missing `workflow_dispatch` trigger for `build-security` (mastodon#29041)

* Configure selenium to use Chrome version 120 (mastodon#29038)

* Fix security builds not being marked latest

* Merge pull request from GHSA-3fjr-858r-92rw

* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1

* Fix build-security workflow for glitch-soc

* Restore -streaming suffix for security builds (glitch-soc#2602)

* Temporary hack to correctly tag the security docker image…

* Fix build-security docker tags

---------

Signed-off-by: Claire <[email protected]>
Co-authored-by: Eugen Rochko <[email protected]>
Co-authored-by: Claire <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Matt Jankowski <[email protected]>
Co-authored-by: KMY(雪あすか) <[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: Aaron Brady <[email protected]>
  • Loading branch information
9 people authored Feb 4, 2024
1 parent 9c02e57 commit 1c1a145
Showing 1 changed file with 0 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown, se
if (lastStatus.get('spoiler_text')) {
setExpanded(!expanded);
}

}, [dispatch, lastStatus, expanded]);

if (lastStatus === null) {
Expand Down

0 comments on commit 1c1a145

Please sign in to comment.