Commit Graph

22 Commits

Author SHA1 Message Date
e92b6ffbce Merge branch 'main' of https://github.com/mastodon/mastodon into features/main 2023-08-22 10:53:28 +00:00
c0cf1ebdd3 Merge branch 'main' of https://github.com/mastodon/mastodon into features/main 2023-08-14 14:25:03 +00:00
Matt Jankowski
30f5ec7303
Rubocop fix: Perfomance/UnfreezeString (#26217) 2023-07-28 23:11:05 +02:00
6877631969 Merge remote-tracking branch 'mastodon/main' into features/main 2023-07-14 17:37:47 +00:00
d7a445b735 Merge remote-tracking branch 'odakyu/custom/quote' into features/mastodon-main 2023-07-13 17:16:03 +00:00
Matt Jankowski
b8b2470cf8
Fix Style/SlicingWithRange cop (#25923) 2023-07-12 10:03:06 +02:00
kyori19
2b808e90c2
Merge remote-tracking branch 'mastodon/main' into custom/odakyudon 2023-07-10 09:03:34 +00:00
kyori19
7876d8f739 Merge remote-tracking branch 'mastodon/main' into custom/quote 2023-07-09 17:28:27 +00:00
090f82f070
Merge pull request #120 from Y-zu-don-maintenance-org/features/v4.1.4
Features/v4.1.4
2023-07-08 23:41:57 +09:00
Claire
f2bbac3f9f Fix crash in admin interface when viewing a remote user with verified links (#25796) 2023-07-07 19:37:21 +02:00
Claire
b6d173b459
Fix crash in admin interface when viewing a remote user with verified links (#25796) 2023-07-07 18:10:17 +02:00
ff17262aff
Merge pull request #119 from Y-zu-don-maintenance-org/features/v4.1.3
Features/v4.1.3
2023-07-06 22:39:03 +09:00
Claire
32ebeed59b
Merge pull request from GHSA-55j9-c3mp-6fcq 2023-07-06 15:06:50 +02:00
Claire
610731b03d
Merge pull request from GHSA-55j9-c3mp-6fcq 2023-07-06 15:06:49 +02:00
Claire
c78280a8ce
Add translate="no" to outgoing mentions and links (#25524) 2023-06-20 18:10:19 +02:00
Nick Schonning
c66250abf1
Autofix Rubocop Regex Style rules (#23690)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
Nick Schonning
49fad26eca
Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02:00
kyori19
bef7f9a21c
Fix quote inline not hidden on WebUI 2022-05-11 14:05:11 +00:00
kyori19
ac517abef2
Fix append_quote uses TagManager instead of ActivityPub::TagManager 2022-05-11 04:58:20 +00:00
kyori19
0c206d8711
Merge remote-tracking branch 'tootsuite/main' into custom/quote 2022-05-10 02:47:45 +00:00
kyori19
64dfd33e3f
Merge remote-tracking branch 'tootsuite/main' into custom/cat 2022-05-02 03:29:39 +00:00
Eugen Rochko
cefa526c6d
Refactor formatter (#17828)
* Refactor formatter

* Move custom emoji pre-rendering logic to view helpers

* Move more methods out of Formatter

* Fix code style issues

* Remove Formatter

* Add inline poll options to RSS feeds

* Remove unused helper method

* Fix code style issues

* Various fixes and improvements

* Fix test
2022-03-26 02:53:34 +01:00