imncls bb6988a7ac Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb		2018-02-23 23:28:31 +09:00
..
activitypub	Revert #5772 (#6221)	2018-01-08 10:57:52 +01:00
admin	Add moderation note (#5240)	2017-10-07 20:26:43 +02:00
api	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
auth	Fix email confirmation link not updating email (#6187)	2018-01-05 00:15:35 +01:00
concerns	Fix regeneration marker not expiring (#6290)	2018-01-18 20:29:56 +01:00
oauth
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
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb	Rewrite account_controller_spec (#5633)	2017-11-09 14:36:17 +01:00
application_controller_spec.rb	Fix force_ssl conditional (#6201)	2018-01-07 15:19:23 +01:00
authorize_follows_controller_spec.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	2018-01-22 14:25:09 +01:00
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
home_controller_spec.rb	When web UI URL used while logged out, redirect to static page (#4954)	2017-09-15 00:57:08 +02: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