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

This commit is contained in:
Thibaut Girka
2018-10-07 19:47:56 +02:00
50 changed files with 1503 additions and 60 deletions

View File

@ -147,7 +147,6 @@ GEM
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.2)
colorize (0.8.1)
concurrent-ruby (1.0.5)
connection_pool (2.2.2)
crack (0.4.3)
@ -676,7 +675,6 @@ DEPENDENCIES
chewy (~> 5.0)
cld3 (~> 3.2.0)
climate_control (~> 0.2)
colorize
derailed_benchmarks
devise (~> 4.5)
devise-two-factor (~> 3.0)
@ -749,7 +747,6 @@ DEPENDENCIES
rspec-rails (~> 3.8)
rspec-sidekiq (~> 3.0)
rubocop (~> 0.59)
ruby-progressbar (~> 1.4)
sanitize (~> 4.6)
scss_lint (~> 0.57)
sidekiq (~> 5.2)