Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00
parent ee560abdbe dc6e031364
commit b28b405b97
29 changed files with 136 additions and 72 deletions
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@ -27,7 +27,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService do

      it 'creates status' do
        status = sender.statuses.first
-        
+
        expect(status).to_not be_nil
        expect(status.text).to eq 'Lorem ipsum'
      end