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

Merge/glitch/20240204 #80

Merged
merged 53 commits into from
Feb 4, 2024
Merged

Merge/glitch/20240204 #80

Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
b19ae52
Add confirmation when redirecting logged-out requests to permalink (#…
Gargron Jan 24, 2024
41c2af2
chore(deps): update dependency rubocop to v1.60.1 (#28731)
renovate[bot] Jan 24, 2024
1290fed
Fix `Rails/WhereExists` cop in app/lib (#28862)
mjankowski Jan 24, 2024
5a838ce
Use active variants for boost icons and increase icon size (#27924)
ClearlyClaire Jan 24, 2024
64993d3
chore(deps): update dependency haml_lint to v0.55.0 (#28856)
renovate[bot] Jan 24, 2024
ea5397c
chore(deps): update dependency selenium-webdriver to v4.17.0 (#28858)
renovate[bot] Jan 24, 2024
559bbf0
chore(deps): update artifact actions (major) to v4 (major) (#28415)
renovate[bot] Jan 24, 2024
7019af4
fix(deps): update dependency dotenv to v16.4.0 (#28872)
renovate[bot] Jan 24, 2024
9c5be13
chore(deps): update dependency chewy to v7.5.0 (#28730)
renovate[bot] Jan 24, 2024
38f7f8b
Tidy up association declaration in `Instance` model (#28880)
mjankowski Jan 24, 2024
9a8293f
Fix process of receiving posts with bearcaps is not working (#26527)
kmycode Jan 25, 2024
c50274a
Fix redirect confirmation for accounts (#28902)
ClearlyClaire Jan 25, 2024
0471a78
Add tests for redirect confirmations (#28903)
ClearlyClaire Jan 25, 2024
087415d
Add tests for processing statuses using bearcap URIs (#28904)
ClearlyClaire Jan 25, 2024
d158f7e
chore(deps): update dependency rspec-rails to v6.1.1 (#28905)
renovate[bot] Jan 25, 2024
1a565e4
fix(deps): update dependency axios to v1.6.6 (#28895)
renovate[bot] Jan 25, 2024
7c9c6c7
Fix remaining `Rails/WhereExists` cop violations, regenerate todo (#2…
mjankowski Jan 25, 2024
a69506a
fix(deps): update dependency dotenv to v16.4.1 (#28889)
renovate[bot] Jan 25, 2024
6b6586f
Add `CustomFilterKeyword#to_regex` method (#28893)
mjankowski Jan 25, 2024
59d2ea0
New Crowdin Translations (automated) (#28899)
github-actions[bot] Jan 25, 2024
ca7053f
Consolidate db test prep steps to rake task (#28886)
mjankowski Jan 25, 2024
c8f59d2
Fix `Style/TernaryParentheses` cop (#28387)
mjankowski Jan 25, 2024
2866106
Reduce factory creation in `spec/models/account_statuses_cleanup_poli…
mjankowski Jan 25, 2024
274a48a
Extract helper methods for db connection and table existence check in…
mjankowski Jan 25, 2024
3205a65
Refactor conversations components in web UI (#28833)
Gargron Jan 25, 2024
17ea226
Fix `Style/GuardClause` cop in app/controllers (#28420)
mjankowski Jan 25, 2024
0b38946
Update paperclip and climate_control gems (#28379)
mjankowski Jan 25, 2024
4cdf62e
Extract `rebuild_index` method in maintenance CLI (#28911)
mjankowski Jan 25, 2024
42ab855
Add specs for `Instance` model scopes and add `with_domain_follows` s…
mjankowski Jan 25, 2024
5fa2821
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-s…
ClearlyClaire Jan 26, 2024
e5f5047
[Glitch] Add confirmation when redirecting logged-out requests to per…
Gargron Jan 24, 2024
54ece50
[Glitch] Use active variants for boost icons and increase icon size
ClearlyClaire Jan 24, 2024
dd7a669
Fix CSS loading in redirect controller
ClearlyClaire Jan 26, 2024
420ca90
Merge pull request #2585 from ClearlyClaire/glitch-soc/merge-upstream
ClearlyClaire Jan 27, 2024
bf153b3
Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-s…
ClearlyClaire Jan 27, 2024
a4e7cc2
Merge pull request #2590 from ClearlyClaire/glitch-soc/merge-upstream
ClearlyClaire Jan 28, 2024
80308d3
[Glitch] Refactor conversations components in web UI (#2589)
ClearlyClaire Jan 28, 2024
3ede233
Fix crash in private mention conversations in glitch-soc flavor (#2595)
ClearlyClaire Jan 30, 2024
8b87673
Remove obsolete locale file (#2596)
ClearlyClaire Jan 30, 2024
a48447a
Add github action workflow for manual security builds (#29040)
ClearlyClaire Feb 1, 2024
85bdd14
Adapt workflow to glitch-soc
ClearlyClaire Feb 1, 2024
883f589
Fix missing `workflow_dispatch` trigger for `build-security` (#29041)
ClearlyClaire Feb 1, 2024
7bb5f6e
Merge pull request #2599 from ClearlyClaire/glitch-soc/build-action
ClearlyClaire Feb 1, 2024
f4416e6
Configure selenium to use Chrome version 120 (#29038)
mjankowski Feb 1, 2024
626ff32
Merge pull request #2600 from ClearlyClaire/glitch-soc/fixes/failures
ClearlyClaire Feb 1, 2024
a7b1600
Fix security builds not being marked latest
ClearlyClaire Feb 1, 2024
3866597
Merge pull request #2601 from ClearlyClaire/glitch-soc/fixes/security…
ClearlyClaire Feb 1, 2024
ff58ec0
Merge pull request from GHSA-3fjr-858r-92rw
ClearlyClaire Feb 1, 2024
63d7a30
Fix build-security workflow for glitch-soc
ClearlyClaire Feb 1, 2024
970320d
Restore -streaming suffix for security builds (#2602)
insom Feb 1, 2024
c3936cb
Temporary hack to correctly tag the security docker image…
ClearlyClaire Feb 1, 2024
5bc39b3
Fix build-security docker tags
ClearlyClaire Feb 1, 2024
5000c87
Merge remote-tracking branch 'glitch-soc/main' into merge/glitch/2024…
neatchee Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
View file
Open in desktop
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
Loading