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.
2018-10-05 15:23:57 +02:00
..
chewy Get rid of Chewy order/limit warning (#8355) 2018-08-22 02:44:56 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
javascript Make hidden media clickable in account media gallery 2018-10-02 22:00:57 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
mailers Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
workers Limit the number of people that can be followed from one account (#8807) 2018-10-04 17:36:11 +02:00