Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
activitypub	…
admin	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
auth	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
concerns	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
oauth	Add force_login option to OAuth authorize page (#8655)	2018-09-09 04:10:44 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
well_known	…
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
authorize_interactions_controller_spec.rb	…
emojis_controller_spec.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
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	…
media_controller_spec.rb	…
remote_follow_controller_spec.rb	…
remote_unfollows_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
shares_controller_spec.rb	…
statuses_controller_spec.rb	…
stream_entries_controller_spec.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
tags_controller_spec.rb	…