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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		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	Do no retry web push workers if the server returns a 4xx response (#9434)	6 years ago
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_conversation.rb	…
account_domain_block.rb	…
account_filter.rb	Redesign admin accounts index (#9340)	6 years ago
account_moderation_note.rb	…
account_pin.rb	…
account_stat.rb	Add profile directory (#9427)	6 years ago
account_tag_stat.rb	Add profile directory (#9427)	6 years ago
admin.rb	…
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	…
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	Make custom emoji domains case insensitive #9351 (#9474)	6 years ago
custom_emoji_filter.rb	Make custom emoji domains case insensitive #9351 (#9474)	6 years ago
custom_filter.rb	…
domain_block.rb	…
email_domain_block.rb	…
export.rb	…
favourite.rb	…
feed.rb	…
follow.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
follow_request.rb	…
home_feed.rb	…
identity.rb	Change identities id column to a bigint (#9371)	6 years ago
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
list.rb	Add database support for list show-reply preferences	6 years ago
list_account.rb	…
list_feed.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mention.rb	…
mute.rb	…
notification.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
preview_card.rb	…
relay.rb	…
remote_follow.rb	…
remote_profile.rb	…
report.rb	…
report_filter.rb	…
report_note.rb	…
search.rb	…
session_activation.rb	…
setting.rb	Remove intermediary arrays when creating hash maps from results (#9291)	6 years ago
site_upload.rb	…
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
status_pin.rb	…
status_stat.rb	…
stream_entry.rb	…
subscription.rb	…
tag.rb	Cache hashtag sample accounts, and exclude ineligible ones (#9465)	6 years ago
trending_tags.rb	Remove intermediary arrays when creating hash maps from results (#9291)	6 years ago
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
web.rb	…