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

20980 Commits

Author SHA1 Message Date
Hinaloe c645490d55
Fix `sensitive` flag not being removed when removing CW in new compose form (#29248) 2024-02-19 13:31:16 +00:00
github-actions[bot] ad16362efe
New Crowdin Translations (automated) (#29255) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-19 13:25:45 +00:00
renovate[bot] fe6c055f35
Update dependency eslint-plugin-jsdoc to v48.1.0 (#29275) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-19 11:10:03 +00:00
Eugen Rochko 63f4ea055a
Change follow suggestions design in web UI (#29272) 2024-02-19 11:09:58 +00:00
Matt Jankowski 245064bb98
Move "everyone" role and "instance actor" account magic number IDs to constants (#29260) 2024-02-19 11:09:43 +00:00
Claire bbecf1c56b
Further reduce differences with upstream (#2631) 
* Further reduce CSS diffs with upstream

* Remove superfluous “Sensitive content” label in media galleries and clean up dead code
 2024-02-18 22:30:20 +01:00
Claire 034be5ad50
Further reduce CSS differences with upstream (#2630) 2024-02-18 20:45:36 +01:00
Claire 9a11b077f7
Reduce CSS and markup differences with upstream (#2629) 2024-02-18 19:12:23 +01:00
Danko Aleksejevs e078ede097
Remove status content from mobile actions modal (#2615) 2024-02-18 19:10:58 +01:00
Claire 8a10feb8dc [Glitch] Fix Web UI not displaying appropriate explanation when a user hides their follows/followers 
Port 9b06c0f24a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-17 20:15:25 +01:00
Claire d86b642dc6
Fix dead and misapplied CSS (#2627) 2024-02-17 18:52:59 +01:00
Claire 41c85e3b6d
Change list title input design to fit upstream (#2626) 
* Change settings input field design to match upstream's

* Fix light theme discrepancies

* Restore regexp inputs as glitch-soc-specific styles
 2024-02-17 18:52:37 +01:00
Claire 5c0a64a975
Merge pull request #2625 from ClearlyClaire/glitch-soc/ports/copy-button-on-profile 
Add prominent share/copy button on profiles in web UI
 2024-02-17 09:39:46 +01:00
Claire 50d9cd66d3 [Glitch] Use container queries to hide profile share button 
Port c94bedf4e6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-16 18:18:17 +01:00
Eugen Rochko ce3978246b [Glitch] Add prominent share/copy button on profiles in web UI 
Port 87696ea26e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-16 18:17:55 +01:00
Claire c0279385d7
Adopt upstream's design for account profiles (#2622) 
* Mostly adopt upstream's design for account profiles

* Reduce some margins
 2024-02-16 17:57:43 +01:00
Claire 96ddf1d482
Fix flaky end-to-end OCR test (#29244) 2024-02-16 16:57:23 +00:00
Wolfgang Fournès cfadb87077
Update enum syntax to use the new Rails 7.0 style (#29217) 2024-02-16 14:54:23 +00:00
Matt Jankowski 1d9d14b8de
Use `abort` instead of `warn(); exit` in boot.rb env check (#29209) 2024-02-16 14:29:24 +00:00
Matt Jankowski 1946e171e6
Reduce round trips in admin/disputes/appeals spec (#29234) 2024-02-16 13:46:28 +00:00
Matt Jankowski 3454fcbd71
Reduce round trips in auth/sessions spec (#29233) 2024-02-16 13:38:49 +00:00
Matt Jankowski a316c0e38d
Reduce round trips in disputes/appeals spec (#29232) 2024-02-16 13:01:15 +00:00
Matt Jankowski 117b507df5
Extract `subject` from `User#mark_email_as_confirmed!` spec (#29231) 2024-02-16 13:01:04 +00:00
Matt Jankowski 1690fb39e6
Reduce `RSpec/MultipleExpectations` in instance_actors_controller spec (#29229) 2024-02-16 13:00:11 +00:00
Matt Jankowski bba488c189
Reduce `RSpec/MultipleExpectations` in media_attachment spec (#29228) 2024-02-16 13:00:09 +00:00
renovate[bot] e140d05a6a
Update dependency doorkeeper to v5.6.9 (#29196) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-16 12:59:51 +00:00
Claire d7d477047e Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 12:17:15 +01:00
Claire 6c1b6194f7 Merge pull request from GHSA-jhrq-qvrm-qr36 
* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
 2024-02-16 12:17:15 +01:00
Claire 5f21a1f5a3
Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 11:06:47 +00:00
Claire 9fee5e8526
Merge pull request from GHSA-jhrq-qvrm-qr36 
* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
 2024-02-16 11:56:12 +01:00
renovate[bot] 63080e10a9 Update dependency pg to v1.5.5 (#29230) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-16 10:06:25 +01:00
renovate[bot] a8ee6fdd62
Update dependency pg to v1.5.5 (#29230) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-16 08:12:10 +00:00
Matt Jankowski a9f9b0097b
Reduce `RSpec/MultipleExpectations` in captcha feature spec (#29226) 2024-02-16 07:52:57 +00:00
Matt Jankowski 4b7f04e3ea
Reduce `RSpec/MultipleExpectations` in post_status_service spec (#29225) 2024-02-16 07:52:29 +00:00
github-actions[bot] 1c93d625c6
New Crowdin Translations (automated) (#29195) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-16 07:51:13 +00:00
Matt Jankowski ed4939296a
Reduce `RSpec/MultipleExpectations` in ap/activity/create spec (#29224) 2024-02-16 07:43:00 +00:00
Matt Jankowski 1df2ffc3ee
Use `subject` in blacklist email validator spec (#29211) 2024-02-16 07:42:03 +00:00
Matt Jankowski fc4f823464
Avoid local block var assignment in ap/process_status_update_service spec (#29210) 2024-02-16 07:41:25 +00:00
Claire e7ca82762d Fix user creation failure handling in OAuth paths (#29207) 2024-02-14 23:12:59 +01:00
Claire d4d0565b0f
Fix user creation failure handling in OAuth paths (#29207) 2024-02-14 21:49:45 +00:00
Matt Jankowski 844aa59bdf
Doc update about ruby version 3.0+ (#29202) 2024-02-14 16:44:27 +00:00
Claire 486e4bc7d3 Fix OmniAuth tests (#29201) 2024-02-14 16:07:28 +01:00
Claire bbbbf00084
Fix OmniAuth tests (#29201) 2024-02-14 14:57:49 +00:00
Claire 40439399c6 Bump version to v4.3.0-alpha.2 (#29200) 2024-02-14 15:26:18 +01:00
Claire 53b73ed6a2 Merge pull request from GHSA-vm39-j3vx-pch3 
* Prevent different identities from a same SSO provider from accessing a same account

* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`

* Rename methods to avoid confusion between OAuth and OmniAuth
 2024-02-14 15:25:15 +01:00
Emelia Smith 436419cc2f Merge pull request from GHSA-7w3c-p9j8-mq3x 
* Ensure destruction of OAuth Applications notifies streaming

Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.

* Ensure password resets revoke access to Streaming API

* Improve performance of deleting OAuth tokens

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-14 15:25:15 +01:00
Claire 8e8e0f104f
Bump version to v4.3.0-alpha.2 (#29200) 2024-02-14 14:20:02 +00:00
Claire b31af34c97
Merge pull request from GHSA-vm39-j3vx-pch3 
* Prevent different identities from a same SSO provider from accessing a same account

* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`

* Rename methods to avoid confusion between OAuth and OmniAuth
 2024-02-14 15:16:07 +01:00
Emelia Smith 68eaa804c9
Merge pull request from GHSA-7w3c-p9j8-mq3x 
* Ensure destruction of OAuth Applications notifies streaming

Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.

* Ensure password resets revoke access to Streaming API

* Improve performance of deleting OAuth tokens

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-14 15:15:34 +01:00
Claire 3c3ef8b9d3 Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default (#29199) 2024-02-14 13:42:15 +01:00