Ondřej Hruška 7a1ca8b0df Merge remote-tracking branch 'upstream/master'

2017-08-07 22:43:52 +02:00

..

admin

Improve admin page (#4121)

2017-07-18 16:38:22 +02:00

api

Merge upstream (#111)

2017-08-01 13:20:29 -07:00

auth

Add "signed in as" header to some pages (#4523)

2017-08-05 04:24:58 +02:00

concerns

HTTP signatures (#4146)

2017-07-14 20:41:49 +02:00

oauth

…

settings

Fix #3910 - Require OTP authentication to disable 2FA (#3935)

2017-06-25 23:51:46 +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

Improve ActivityPub representations (#3844)

2017-07-15 03:01:39 +02:00

application_controller_spec.rb

…

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

Replace OEmbed and initial state Rabl templates with serializers (#4110)

2017-07-08 14:51:05 +02:00

manifests_controller_spec.rb

Add controller spec for manifests controller (#4003)

2017-06-30 13:43:34 +02:00

media_controller_spec.rb

…

remote_follow_controller_spec.rb

…

statuses_controller_spec.rb

…

stream_entries_controller_spec.rb

…

tags_controller_spec.rb

…