Merge branch 'dev' into upgrade/bootstrap

This commit is contained in:
Brenda Wallace
2019-05-23 20:19:38 +12:00
committed by GitHub

View File

@@ -197,7 +197,7 @@ GEM
highline
tilt
trollop (= 1.16.2)
haml-rails (2.0.0)
haml-rails (2.0.1)
actionpack (>= 5.1)
activesupport (>= 5.1)
haml (>= 4.0.6, < 6.0)
@@ -425,7 +425,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.69.0)
rubocop (0.70.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
@@ -437,7 +437,7 @@ GEM
ruby-progressbar (1.10.0)
ruby-units (2.3.1)
ruby_dep (1.5.0)
ruby_parser (3.13.0)
ruby_parser (3.13.1)
sexp_processor (~> 4.9)
rubyzip (1.2.2)
sass (3.7.3)
@@ -465,7 +465,7 @@ GEM
activemodel (>= 5)
elasticsearch (>= 6)
hashie
selenium-webdriver (3.142.2)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
sexp_processor (4.12.0)