Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		2019-03-14 17:17:20 +01:00
..
activitypub	Add specs for activitypub collections controller (#9484)	2018-12-10 21:39:25 +01:00
admin	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01: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	2018-12-15 10:45:53 +01:00
well_known
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
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