Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		2018-08-24 15:10:34 +02:00
..
activitypub
admin	Add confirmation step to account suspensions (#8353)	2018-08-22 11:53:41 +02:00
api	Update Rails (#8141)	2018-08-13 18:17:20 +02:00
auth	Add missing tests for confirmations controller (#7866)	2018-06-21 10:40:23 +09:00
concerns	Update Rails (#8141)	2018-08-13 18:17:20 +02:00
oauth
settings	Migrate glitch-soc keyword mutes to Mastodon's	2018-07-09 19:19:23 +02:00
well_known
about_controller_spec.rb	Compensate for scrollbar disappearing when media modal visible (#8100)	2018-07-31 01:14:33 +02:00
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
authorize_interactions_controller_spec.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
emojis_controller_spec.rb	Add a test for emojis_controller (#7652)	2018-05-28 22:56:58 +09:00
follower_accounts_controller_spec.rb	Add tests for followers_accounts_controller (#7794)	2018-06-13 10:28:39 +09:00
following_accounts_controller_spec.rb	Add tests for following accounts controller (#7800)	2018-06-14 10:49:17 +09:00
home_controller_spec.rb
intents_controller_spec.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
invites_controller_spec.rb	Fix tests for invites controller (regression from 4d81809f36) (#7597)	2018-05-23 06:32:10 +02:00
manifests_controller_spec.rb
media_controller_spec.rb
remote_follow_controller_spec.rb
remote_unfollows_controller_spec.rb	Add tests for remote_unfollows_controller (#7879)	2018-06-24 19:55:55 +09:00
shares_controller_spec.rb	Add tests for shares_controller (#7835)	2018-06-18 10:45:20 +09:00
statuses_controller_spec.rb
stream_entries_controller_spec.rb
tags_controller_spec.rb