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 e2d9635074ad33cc8144adc434bcd90faae9c424 #2580

Merged
merged 35 commits into from
Jan 24, 2024
Merged

Merge upstream changes up to e2d9635074ad33cc8144adc434bcd90faae9c424 #2580

merged 35 commits into from
Jan 24, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Jan 22, 2024 •
edited
Loading

⚠️ This changes the format of the streaming server logs to a JSON format

Merge upstream changes up to 1335083

Conflicts

  • streaming/index.js:
    Upstream significantly refactored that file, while one modified function had a different signature because of support for local-only posts.
    Ported upstream's change and kept the local-only support.
  • yarn.lock:
    Upstream added new dependencies, one of which was textually close to a glitch-soc-only dependency.
    Updated accordingly.

Merge upstream changes up to 163db81

Ported changes

Merge upstream changes up to e2d9635

Ported changes

ThisIsMissEm and others added 30 commits January 18, 2024 18:40
@ThisIsMissEm
Streaming: replace npmlog with pino & pino-http (mastodon#27828)
1335083
@renovate
Update dependency rdf-normalize to v0.7.0 (mastodon#26769)
244182a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sass to v1.70.0 (mastodon#28799)
5ae3bae 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Add Account.auditable scope, fix N+1 in admin/action_logs#index (ma…
1480573 
…stodon#28812)
@ShadowJonathan @ClearlyClaire
Retry 401 errors on replies fetching (mastodon#28788)
de09176 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
@mjankowski
Fix Rails/WhereExists cop in app/lib/status_cache_hydrator (mastodo…
fd64817 
…n#28808)
@renovate
Update dependency intl-messageformat to v10.5.10 (mastodon#28809)
6dc9732 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency kt-paperclip to v7.2.2 (mastodon#28813)
6a1c998 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@hteumeuleu
Fix banner image not showing in follow emails (mastodon#28814)
86cc88c
@mjankowski
Migrate controller->request spec for api/v1/follow* (mastodon#28811)
329911b
@mjankowski
Fix Rails/WhereExists cop in REST::TagSerializer model (mastodon#28790
4ec7d7d 
)
@renovate @renchap
Update dependency react-redux to v9.1.0 (mastodon#28717)
163db81 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28798)
9cd1702 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Update pre_migration_check postgres version requirement (mastodon#28800)
6a5d70e
@mjankowski
Move privacy policy into markdown file (mastodon#28699)
5fc4ae7
@ClearlyClaire
Add rate-limit of TOTP authentication attempts at controller level (m…
3593ee2 
…astodon#28801)
@ClearlyClaire
Fix processing of compacted single-item JSON-LD collections (mastodon…
cf2a2ed 
…#28816)
@ClearlyClaire
Fix error when processing remote files with unusually long names (mas…
93957da 
…todon#28823)
@Gargron
Fix duplicate and missing keys in search popout component in web UI (m…
9f8e3cc 
…astodon#28834)
@ThisIsMissEm
Streaming: Move more methods to the utils from the main file (mastodo…
3fbf019 
…n#28825)
@renovate
Update dependency jsdom to v24 (mastodon#28836)
62001b5 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency core-js to v3.35.1 (mastodon#28831)
9ff9849 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency dotenv to v16.3.2 (mastodon#28824)
a83aecc 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @types/react to v18.2.48 (mastodon#28839)
e078d00 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@andypiper
docs: update FEDERATION.md to more closely follow FEP conventions. (m…
9620b21 
…astodon#28838)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28827)
76e383e 
Co-authored-by: GitHub Actions <noreply@github.com>
@mjankowski
Use ruby version 3.2.3 (mastodon#28817)
5efb00d
@mjankowski
Move controller->request specs for api/v1/statuses/* (mastodon#28818)
7ecf7f5
@mjankowski
Add Account.matches_uri_prefix scope and use in activitypub/followe…
18004bf 
…rs_synchronizations controller (mastodon#28820)
@ClearlyClaire
Add notification email on invalid second authenticator (mastodon#28822)
e2d9635
ClearlyClaire and others added 5 commits January 22, 2024 19:01
@ClearlyClaire
Merge commit '1335083bedd1dd563cfa9c54e69abc189ba3ec7b' into glitch-s…
3cac826 
…oc/merge-upstream

Conflicts:
- `streaming/index.js`:
  Upstream significantly refactored that file, while one modified
  function had a different signature because of support for local-only
  posts.
  Ported upstream's change and kept the local-only support.
- `yarn.lock`:
  Upstream added new dependencies, one of which was textually close to
  a glitch-soc-only dependency.
  Updated accordingly.
@ClearlyClaire
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-s…
0700eb5 
…oc/merge-upstream
@renovate @renchap @ClearlyClaire
[Glitch] Update dependency react-redux to v9.1.0
1d381c1 
Port 163db81 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-s…
102eff7 
…oc/merge-upstream
@Gargron @ClearlyClaire
[Glitch] Fix duplicate and missing keys in search popout component in…
72bae7e 
… web UI

Port 9f8e3cc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire ClearlyClaire changed the title Merge upstream changes Merge upstream changes up to e2d9635074ad33cc8144adc434bcd90faae9c424 Jan 22, 2024
@ClearlyClaire ClearlyClaire marked this pull request as ready for review January 22, 2024 19:37
@ClearlyClaire ClearlyClaire merged commit 634acd0 into glitch-soc:main Jan 24, 2024
39 checks passed
@ClearlyClaire ClearlyClaire mentioned this pull request Jan 24, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ClearlyClaire @ThisIsMissEm @mjankowski @ShadowJonathan @hteumeuleu @Gargron @andypiper