You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
7 years ago
..
chewy Get rid of Chewy order/limit warning (#8355) 8 years ago
controllers Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
helpers Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
javascript Make hidden media clickable in account media gallery 8 years ago
lib Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
mailers Fix low-hanging rubocop gripes (#8458) 8 years ago
models Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
policies Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
presenters Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
serializers Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
services Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
validators Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
views Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
workers Limit the number of people that can be followed from one account (#8807) 7 years ago