David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master

2017-10-16 01:29:02 -05:00

..

activitypub

…

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

…

about_controller_spec.rb

…

account_follow_controller_spec.rb

…

account_unfollow_controller_spec.rb

…

accounts_controller_spec.rb

…

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

…

statuses_controller_spec.rb

…

stream_entries_controller_spec.rb

…

tags_controller_spec.rb

Redesign public hashtag pages (#5237)

2017-10-07 20:00:35 +02:00