David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master		2017-10-16 01:29:02 -05:00
..
activitypub	Set correct content-type for ActivityPub JSON (#4592)	2017-08-14 04:16:43 +02:00
admin	Add moderation note (#5240)	2017-10-07 20:26:43 +02:00
api	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
auth	Default follows for new users (#4871)	2017-09-10 09:58:38 +02:00
concerns	Improve spec of Feed and UserTrackingConcern (#5367)	2017-10-13 11:00:11 +02:00
oauth
settings	Separate notifications preferences from general preferences (#4447)	2017-10-04 10:22:52 +02: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	Show pinned statuses only in the top of the profile page (#4803)	2017-09-04 12:53:18 +02:00
application_controller_spec.rb
authorize_follows_controller_spec.rb
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
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