Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +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	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
api	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-04 20:40:19 +02:00
auth	Check that an invite link is valid before bypassing approval mode (#10657)	2019-05-02 04:30:12 +02: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-06-10 18:59:53 +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
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
remote_unfollows_controller_spec.rb
shares_controller_spec.rb
statuses_controller_spec.rb
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