Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
parent 3191c3b349 780d99c204
commit 68629f2773
40 changed files with 669 additions and 130 deletions
@@ -117,7 +117,7 @@ group :test do
  gem 'rspec-sidekiq', '~> 3.0'
  gem 'simplecov', '~> 0.16', require: false
  gem 'webmock', '~> 3.5'
-  gem 'parallel_tests', '~> 2.28'
+  gem 'parallel_tests', '~> 2.29'
 end

 group :development do