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	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
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	Migrate all old direct messages to new conversations schema (#9085)	6 years ago
account_domain_block.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
account_filter.rb	Redesign admin accounts index (#9340)	6 years ago
account_moderation_note.rb	…
account_pin.rb	Add API endpoint to list featured accounts (fixes #8315) (#8317)	6 years ago
account_stat.rb	Add profile directory (#9427)	6 years ago
account_tag_stat.rb	Add profile directory (#9427)	6 years ago
admin.rb	Add logging of admin actions (#5757)	7 years ago
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	Thread scopes through #matches?. #454.	7 years ago
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	Add option to block reports from domain (#8830)	6 years ago
email_domain_block.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
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	Extract counters from accounts table to account_stats table (#9295)	6 years ago
follow_request.rb	Limit the number of people that can be followed from one account (#8807)	6 years ago
home_feed.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
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	Improve support for aspects/circles (#8950)	6 years ago
mute.rb	…
notification.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
preview_card.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
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	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	Reset status cache when status_stat or media_attachment updates (#9119)	6 years ago
stream_entry.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
subscription.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
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	…