Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
activitypub	Add specs for ActivityPub::InboxesController (#9456)	2018-12-07 16:40:01 +01:00
admin	Redesign admin accounts index (#9340)	2018-11-26 15:53:27 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
auth	fix: Execute PAM authentication tests on CircleCI (#9029)	2018-10-20 17:28:04 +02:00
concerns	Improve signature verification safeguards (#8959)	2018-10-12 07:00:41 +02:00
oauth	…
settings	…
well_known	…
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	…
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	…
remote_follow_controller_spec.rb	…
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	…