mastodon/spec/controllers
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
..
activitypub
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 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 Compensate for scrollbar disappearing when media modal visible (#8100) 2018-07-31 01:14:33 +02:00
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 Optimize the process of following someone (#9220) 2018-11-08 21:05:42 +01:00
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 Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
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 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