Conflicts: - `app/helpers/theme_helper.rb`: Conflict caused by our different theme systems. Ported upstream's changes. - `app/models/account.rb`: Upstream basically made a change we already made. Moved constant declaration to match upstream.
send
rubocop:disable
ImportVacuum
PAPERCLIP_ROOT_URL
ThreadingHelper
RSpec/AnyInstance
account_id
max_id
min_id
RSpec/DescribedClass
RSpec/StubbedMock
RSpec/VerifiedDoubles