mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
22,958 Commits 2 Branches 16 Tags 298 MiB
Commit Graph

22958 Commits

Author SHA1 Message Date
Claire 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
 2024-09-06 19:25:31 +02:00
Matt Jankowski 7335a43b6d
Use async count in admin dashboard (#30606) 2024-09-06 16:52:35 +00:00
Matt Jankowski 0a433d08fb
Move shares/modal body class to layout (#31789) 2024-09-06 16:46:55 +00:00
Matt Jankowski 4f81ad2494
Add coverage for `media#player`, move body class to view (#31790) 2024-09-06 16:46:25 +00:00
Matt Jankowski b530fc5267
Update rails to version 7.1.4 (#31563) 2024-09-06 15:22:35 +00:00
Emelia Smith c88ba523ee
Fix sort order of moderation notes on Reports and Accounts (#31528) 2024-09-06 14:58:36 +00:00
Matt Jankowski a9d0b48b65
Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
Emelia Smith fd7fc7bdc3
Disable actions on reports that have already been taken (#31773) 2024-09-06 12:50:30 +00:00
Claire 1fed11cfa7
Target firefox all the way back to Firefox 78 (#31782) 2024-09-06 12:33:38 +00:00
Claire ebf09328d4
Disable codecov github annotations (#31783) 2024-09-06 10:58:53 +00:00
Matt Jankowski 6b6a80b407
Remove `body_as_json` in favor of built-in `response.parsed_body` for JSON response specs (#31749) 2024-09-06 09:58:46 +00:00
Matt Jankowski be77a1098b
Extract `Account::AUTOMATED_ACTOR_TYPES` for "bot" actor_type values (#31772) 2024-09-06 07:49:38 +00:00
github-actions[bot] cc4865193a
New Crowdin Translations (automated) (#31781) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-06 07:38:08 +00:00
renovate[bot] 60182db0ca
Update dependency tzinfo-data to v1.2024.2 (#31780) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-06 07:30:53 +00:00
Claire 4cd74585ae
Merge pull request #2836 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 5acec087ca
 2024-09-05 22:56:10 +02:00
Matt Jankowski 7efe0bde9d
Add `have_http_link_header` matcher and set header values as strings (#31010) 2024-09-05 20:05:38 +00:00
Matt Jankowski 09017dd8f0
Add worker spec for annual report worker (#31778) 2024-09-05 19:51:17 +00:00
Michael Stanclift db6b1fe8fb [Glitch] Fix radio checkbox visibility in Report dialogs 
Port b4b639ee4a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-05 20:40:31 +02:00
Eugen Rochko cb324b5d7c [Glitch] Change design of unread conversations in web UI 
Port ec4c49082e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-05 20:40:04 +02:00
Claire 1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
Matt Jankowski 5acec087ca
Simplify basic presence validations (#29664) 2024-09-05 15:36:05 +00:00
Eugen Rochko bc435c63bd
Change width of columns in advanced web UI (#31762) 2024-09-05 14:57:53 +00:00
Matt Jankowski 850478dc14
Use `conflicted` configuration for renovate rebase strategy (#31770) 2024-09-05 14:41:14 +00:00
Matt Jankowski d58faa2018
Remove references to deprecated `Import` model (#31759) 2024-09-05 14:07:17 +00:00
David Roetzel f85694acfd
Add credentials to redis sentinel configuration (#31768) 2024-09-05 14:06:58 +00:00
Michael Stanclift b4b639ee4a
Fix radio checkbox visibility in Report dialogs (#31752) 2024-09-05 12:34:13 +00:00
Matt Jankowski e820cc30b8
Convert invites controller spec to system/request specs (#31755) 2024-09-05 11:54:27 +00:00
renovate[bot] 5b1ae15a36
Update docker.io/ruby Docker tag to v3.3.5 (#31758) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 11:06:05 +00:00
Matt Jankowski 8fd3e37747
Update `parser` and `rubocop` gems (#31760) 2024-09-05 10:20:27 +00:00
renovate[bot] bd8cd0c6e7
Update dependency cssnano to v7.0.6 (#31757) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-05 09:50:38 +00:00
James May f9712fad1b
Direct link to each authorized_application entry with html anchor (#31677) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2024-09-05 09:48:42 +00:00
Matt Jankowski ba9fd1c32e
Add coverage for `Account#prepare_contents` callback (#31748) 2024-09-05 09:48:33 +00:00
Eugen Rochko b265a654d7
Fix wrong width on content warnings and filters in web UI (#31761) 2024-09-05 09:46:11 +00:00
github-actions[bot] eb23d9f0f6
New Crowdin Translations (automated) (#31765) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-05 09:40:38 +00:00
Eugen Rochko ec4c49082e
Change design of unread conversations in web UI (#31763) 2024-09-05 09:39:59 +00:00
David Roetzel 7d91723f05
Support `REDIS_SENTINEL_PORT` variables (#31767) 2024-09-05 09:26:49 +00:00
Claire 5a1d7db309
Merge pull request #2835 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to fe04291af4
 2024-09-04 23:01:53 +02:00
Matt Jankowski 4d5c91e99a
Remove `before` block in spec with TODOs which have been TO-DONE already (#31754) 2024-09-04 19:51:40 +00:00
Matt Jankowski 4678473e54
Add `AnnualReport::Source#report_statuses` method for subclasses to use (#31753) 2024-09-04 19:50:33 +00:00
Claire cb1eaa10f2 Fix glitch-soc-only tests 2024-09-04 20:07:23 +02:00
Claire 1fb31ad9b1 [Glitch] Fix display name being displayed instead of domain in remote reports 
Port 585e369e0b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-04 19:43:21 +02:00
Claire 1d86377ba9 [Glitch] Fix all notification types being stored without filtering when polling 
Port fab29ebbe8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-04 19:42:45 +02:00
Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
 2024-09-04 19:38:52 +02:00
Claire 559958f8c5
Fix email language when recipient has no selected locale (#31747) 2024-09-04 17:35:40 +00:00
Matt Jankowski e1b5f3fc6f
Use `response.parsed_body` for html response checks (#31750) 2024-09-04 17:29:05 +00:00
Matt Jankowski fe04291af4
Use more accurate beginning/ending times in annual report source (#31751) 2024-09-04 17:19:53 +00:00
David Roetzel ef2bc8ea26
Add redis sentinel support to ruby part of code (#31744) 2024-09-04 14:10:45 +00:00
Emelia Smith 9ba81eae3e
Streaming: Improve Redis connection options handling (#31623) 2024-09-04 14:10:26 +00:00
Claire 585e369e0b
Fix display name being displayed instead of domain in remote reports (#31613) 2024-09-04 13:43:08 +00:00
Claire fab29ebbe8
Fix all notification types being stored without filtering when polling (#31745) 2024-09-04 13:28:16 +00:00