Merge tag 'v2.6.0rc1' into instance_only_statuses

2018-10-23 08:32:55 +02:00
parent d42a06fc74 f468bfb830
commit fde9668bae
570 changed files with 11506 additions and 5693 deletions
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@ -154,7 +154,7 @@ RSpec.describe Status, type: :model do

  describe '#target' do
    it 'returns nil if the status is self-contained' do
-     expect(subject.target).to be_nil
+      expect(subject.target).to be_nil
    end

    it 'returns nil if the status is a reply' do