You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
admin	…
concerns	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
form	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
web	…
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_domain_block.rb	…
account_filter.rb	…
account_moderation_note.rb	…
account_pin.rb	Add API endpoint to list featured accounts (fixes #8315) (#8317)	6 years ago
admin.rb	…
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	…
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	…
domain_block.rb	…
email_domain_block.rb	…
export.rb	Show exact number of followers/statuses on export page/in tooltip (#8199)	6 years ago
favourite.rb	Fix error when trying to update counters for statuses that are gone (#8251)	6 years ago
feed.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
follow.rb	Implement Undo { Accept { Follow } } (fixes #8234) (#8245)	6 years ago
follow_request.rb	…
home_feed.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
identity.rb	…
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
media_attachment.rb	…
mention.rb	…
mute.rb	…
notification.rb	Remove annoying Notification#cache_ids scope warning (#8333)	6 years ago
preview_card.rb	…
relay.rb	Expect relays to answer with accept/reject (#8179)	6 years ago
remote_follow.rb	Add remote interaction dialog for toots (#8202)	6 years ago
remote_profile.rb	…
report.rb	Add preference for report notification e-mails, skip for duplicates (#8559)	6 years ago
report_filter.rb	…
report_note.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
status_pin.rb	…
status_stat.rb	Move status counters to separate table, count replies (#8104)	6 years ago
stream_entry.rb	…
subscription.rb	…
tag.rb	…
trending_tags.rb	…
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
web.rb	…