Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
activitypub
admin
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
auth
concerns
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	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
invites_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
manifests_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
media_controller_spec.rb
remote_follow_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
remote_interaction_controller_spec.rb
remote_unfollows_controller_spec.rb
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	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
tags_controller_spec.rb