Thibaut Girka 1682ac5717 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.		2019-04-04 14:53:52 +02:00
..
activitypub	Do not try fetching keys of unknown accounts on a Delete from them (#10326)	2019-03-20 17:20:16 +01:00
admin	Add validations to admin settings (#10348)	2019-03-23 14:07:04 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-01 21:28:31 +02:00
auth	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
concerns	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
oauth
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
well_known	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
about_controller_spec.rb
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
application_controller_spec.rb
authorize_interactions_controller_spec.rb	Optimize the process of following someone (#9220)	2018-11-08 21:05:42 +01:00
emojis_controller_spec.rb
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
home_controller_spec.rb
intents_controller_spec.rb
invites_controller_spec.rb
manifests_controller_spec.rb
media_controller_spec.rb
relationships_controller_spec.rb	Add relationship manager UI (#10268)	2019-03-16 11:23:22 +01:00
remote_follow_controller_spec.rb
remote_interaction_controller_spec.rb	Add specs for RemoteInteractionController (#9524)	2018-12-14 20:36:40 +01:00
remote_unfollows_controller_spec.rb
shares_controller_spec.rb
statuses_controller_spec.rb	Fix thread depth computation in statuses_controller (#9426)	2018-12-05 02:12:29 +01:00
stream_entries_controller_spec.rb
tags_controller_spec.rb	Redesign public hashtag page to use a masonry layout (#9822)	2019-01-16 19:47:46 +01:00