6 commits

Author	SHA1	Message	Date
Jeremy Kescher	68101baae1	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/controllers/settings/preferences_controller.rb # app/javascript/mastodon/utils/resize_image.js # app/lib/user_settings_decorator.rb # app/models/media_attachment.rb # app/models/user.rb # app/views/settings/preferences/appearance/show.html.haml # app/workers/scheduler/indexing_scheduler.rb # config/settings.yml # db/schema.rb	2023-04-03 21:50:15 +02:00
Eugen Rochko	68a192e718	Change "direct message" nomenclature to "private mention" in web UI (#24248)	2023-03-30 15:16:20 +02:00
Jeremy Kescher	722b6697d7	Merge remote-tracking branch 'upstream/main' into develop	2023-03-28 17:31:34 +02:00
Yamagishi Kazutoshi	d1b057a0ac	Remove legacy decorators syntax (#18357)	2023-03-24 03:17:53 +01:00
Jeremy Kescher	7318b74ebf	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml	2023-03-05 12:34:16 +01:00
Renaud Chaput	44a7d87cb1	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00

Renamed from app/javascript/mastodon/components/status_action_bar.js (Browse further)