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 e68b26c8df2056182564abcee230927ed53200c8 #2902

Merged
merged 38 commits into from
Nov 24, 2024
Merged

Merge upstream changes up to e68b26c8df2056182564abcee230927ed53200c8 #2902

merged 38 commits into from
Nov 24, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Nov 24, 2024 •
edited
Loading

Conflicts

  • app/models/trends/statuses.rb:
    Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions.
    Added the date restriction to glitch-soc's conditions.

Ported changes

mjankowski and others added 30 commits November 16, 2024 20:48
@mjankowski
Remove remnants of embed views (mastodon#32419)
a1ac2a7
@mjankowski
Use with_options blocks in Associations concern (mastodon#32840)
1c6f53e
@renchap
Add OpenTelemetry VCS attributes (mastodon#32904)
bcf5d30
@tribela
Add missing autofocus on boost modal (mastodon#32953)
60801ab
@renovate
Update libretranslate/libretranslate Docker tag to v1.6.2 (mastodon#3…
5b68f4b 
…2951)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @formatjs/cli to v6.3.11 (mastodon#32950)
49a12a2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32927)
02985aa 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Form::Import spec reduce factories (mastodon#32924)
be413d6
@mjankowski
Reduce long lines in relationships/show view (mastodon#32922)
16addf4
@mjankowski
Extract constants for controller LIMIT queries (mastodon#32921)
c511cbc
@renovate
Update dependency aws-sdk-s3 to v1.171.0 (mastodon#32901)
d8e907f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Use nil instead of false for datetime value in spec (mastodon#32926)
03ee08c
@ThisIsMissEm
Streaming: add development logging of database queries (mastodon#32945)
9a46329
@Gargron
Fix min_id and max_id causing error in search API (mastodon#32857)
911d7db
@mjankowski
Move self destruct check to config_for and add constant for verifie…
c0c34d3 
…r string (mastodon#32943)
@drwl
Change dependency from annotate to annotaterb (mastodon#30232)
3e44dca
@mjankowski
Use hash arguments to select when possible (Rails 7.2) (mastodon#32917
477412d 
)
@mjankowski
Use hash arguments to order when possible (Rails 7.2) (mastodon#32915)
da826fe
@mjankowski
Add coverage for fixing the thing with the dates in the search area (m…
30a7986 
…astodon#32958)
@mjankowski
Prep work for coverage addition to ActivityPub::DeliveryWorker spec (…
295ad6f 
…mastodon#32944)
@mjankowski
Use group/count approach in annual report classes (mastodon#32914)
4259828
@shleeable
DB Replica database_tasks as ENV (mastodon#32908)
06fcee0
@Gargron
Fix notification polling showing a loading bar in web UI (mastodon#32960
e856838 
)
@renovate
Update dependency aws-sdk-s3 to v1.172.0 (mastodon#32964)
436a5d2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32969)
9fc2fc2 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Add LoginActivity model spec and BrowserDetection concern shared …
87e7ad9 
…example (mastodon#32959)
@mjankowski
Extract Notification::Groups concern (mastodon#32968)
f2976ec
@Gargron
Change lists to reflect added and removed users retroactively (mastod…
2b5faa2 
…on#32930)
@mjankowski
Use hash arguments to group when possible (mastodon#32916)
37f00fb
@ClearlyClaire
Fix error when viewing statuses to deleted replies in moderation view (…
30e9c71 
…mastodon#32986)
renovate bot and others added 8 commits November 20, 2024 07:42
@renovate
Update dependency opentelemetry-instrumentation-rails to '~> 0.33.0' (m…
41b033e 
…astodon#32987)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Add AccountWarning case to Report#history spec (mastodon#32984)
b66fbae
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#32990)
4252b13 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update dependency json-schema to v5.1.0 (mastodon#32992)
174c687 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Fix posts made in the future being allowed to trend (mastodon#32996)
e68b26c
@ClearlyClaire
Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-s…
6374937 
…oc/merge-upstream

Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
@tribela @ClearlyClaire
[Glitch] Add missing autofocus on boost modal
06c462e 
Port 60801ab to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Fix notification polling showing a loading bar in web UI
bcd2920 
Port e856838 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review November 24, 2024 16:36
@ClearlyClaire ClearlyClaire merged commit f87a06f into glitch-soc:main Nov 24, 2024
35 checks passed
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.
8 participants
@ClearlyClaire @mjankowski @renchap @tribela @ThisIsMissEm @Gargron @drwl @shleeable