Merge branch 'snapcon' of github.com:snap-cloud/osem into snapcon

* 'snapcon' of github.com:snap-cloud/osem:
  Update shoulda-matchers to version 4.1.2
  Update rails-assets-bootstrap-select to version 1.13.10
This commit is contained in:
Michael Ball 2019-12-17 11:17:22 -08:00
commit c1810b31c2

View file

@ -397,16 +397,16 @@ GEM
bundler (>= 1.3.0)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-assets-bootstrap (3.3.6)
rails-assets-jquery (>= 1.9.1, < 3)
rails-assets-bootstrap (3.4.1)
rails-assets-jquery (>= 1.9.1, < 4)
rails-assets-bootstrap-markdown (2.10.0)
rails-assets-bootstrap (~> 3)
rails-assets-bootstrap-select (1.13.3)
rails-assets-bootstrap-select (1.13.10)
rails-assets-bootstrap (>= 3.0.0)
rails-assets-jquery (>= 1.9.1, < 4)
rails-assets-date.format (1.2.3)
rails-assets-holderjs (2.9.6)
rails-assets-jquery (2.2.4)
rails-assets-jquery (3.4.1)
rails-assets-jquery-smooth-scroll (2.2.0)
rails-assets-jquery (>= 1.7.0)
rails-assets-markdown (0.5.0)
@ -526,7 +526,7 @@ GEM
rubyzip (>= 1.2.2)
sexp_processor (4.11.0)
shellany (0.0.1)
shoulda-matchers (4.0.1)
shoulda-matchers (4.1.2)
activesupport (>= 4.2.0)
simplecov (0.16.1)
docile (~> 1.1)