Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

spec/controllers/api/base_controller_spec.rb

@@ -88,10 +88,11 @@ describe Api::BaseController do
       Mastodon::NotPermittedError => 403,
     }.each do |error, code|
       it "Handles error class of #{error}" do
-        expect(FakeService).to receive(:new).and_raise(error)
+        allow(FakeService).to receive(:new).and_raise(error)
 
         get 'error'
         expect(response).to have_http_status(code)
+        expect(FakeService).to have_received(:new)
       end
     end
   end

spec/controllers/api/v1/media_controller_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Api::V1::MediaController do
     describe 'with paperclip errors' do
       context 'when imagemagick cant identify the file type' do
         it 'returns http 422' do
-          expect_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Errors::NotIdentifiedByImageMagickError)
+          allow_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Errors::NotIdentifiedByImageMagickError)
           post :create, params: { file: fixture_file_upload('attachment.jpg', 'image/jpeg') }
 
           expect(response).to have_http_status(422)
@@ -25,7 +25,7 @@ RSpec.describe Api::V1::MediaController do
 
       context 'when there is a generic error' do
         it 'returns http 422' do
-          expect_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Error)
+          allow_any_instance_of(Account).to receive_message_chain(:media_attachments, :create!).and_raise(Paperclip::Error)
           post :create, params: { file: fixture_file_upload('attachment.jpg', 'image/jpeg') }
 
           expect(response).to have_http_status(500)