David Yip 201e82686f Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

2018-01-17 18:37:09 -06: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 remote-tracking branch 'tootsuite/master' into merge-upstream

2017-12-12 02:54:13 -06:00

auth

Fix email confirmation link not updating email (#6187)

2018-01-05 00:15:35 +01:00

concerns

Fix home regeneration (#6251)

2018-01-17 23:56:03 +01:00

oauth

…

settings

Thank you, Officer Murphy

2018-01-10 12:10:43 -06: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

Remote following success page (#4129)

2017-07-10 18:05:06 +02: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

…

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