glitchier-soc/spec/controllers
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
..
activitypub Revert #5772 (#6221) 2018-01-08 10:57:52 +01:00
admin Improve require_admin! and require_staff! filters (#7018) 2018-04-03 13:07:32 +02:00
api Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
auth Fix email confirmation link not updating email (#6187) 2018-01-05 00:15:35 +01:00
concerns Set the default locale in config (#6580) 2018-03-04 09:21:35 +01:00
oauth Cover Oauth::AuthorizedApplicationsController (#3359) 2017-05-29 18:08:05 +02:00
settings Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
well_known Improve ActivityPub representations (#3844) 2017-07-15 03:01:39 +02:00
about_controller_spec.rb Cover AboutController more in spec (#3226) 2017-05-22 16:27:19 +02:00
account_follow_controller_spec.rb Cover AccountFollowController more in spec (#3227) 2017-05-22 16:29:48 +02:00
account_unfollow_controller_spec.rb Cover AccountUnfollowController more in spec (#3228) 2017-05-22 17:58:49 +02:00
accounts_controller_spec.rb Rewrite account_controller_spec (#5633) 2017-11-09 14:36:17 +01:00
application_controller_spec.rb Improve require_admin! and require_staff! filters (#7018) 2018-04-03 13:07:32 +02:00
authorize_follows_controller_spec.rb Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 2018-01-22 14:25:09 +01:00
follower_accounts_controller_spec.rb Introduce recent to Follow (#3247) 2017-05-23 13:12:19 +02:00
following_accounts_controller_spec.rb Introduce recent to Follow (#3247) 2017-05-23 13:12:19 +02:00
home_controller_spec.rb Redirect from Web tag timeline to public tag timeline if not signed in (#6633) 2018-03-05 19:29:36 +01:00
manifests_controller_spec.rb Make Chrome splash screen same color as web UI's background color (#5169) 2017-10-02 01:23:32 +02:00
media_controller_spec.rb Extract authorization policy for viewing statuses (#3150) 2017-05-29 18:22:22 +02:00
remote_follow_controller_spec.rb rescue HTTP::ConnectionError in RemoteFollowController#create (#4726) 2017-08-28 19:12:09 +02:00
statuses_controller_spec.rb Fetch reblogs as Announce activity instead of Note object (#4672) 2017-08-24 16:21:42 +02:00
stream_entries_controller_spec.rb Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
tags_controller_spec.rb Redesign public hashtag pages (#5237) 2017-10-07 20:00:35 +02:00