Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1520 from projecttacoma/MAT-1708
Browse files Browse the repository at this point in the history 
MAT-1708 Set Up All Bonnie Repos to Test for QDM Release

Updated cqm-models, cqm-execution and cqm-parsers versions(BONNIEMAT-623 & BONNIEMAT-629 cql-execution change)
Fixed security vulnerabilities & rails upgrade to v5.2.4.4
  • Loading branch information
@adongare
adongare authored Sep 11, 2020
2 parents 514494d + 332e436 commit 590fc62
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ script:
- bundle exec rake teaspoon DIR='javascripts'
- bash <(curl -s https://codecov.io/bash) -f ./coverage-frontend/default/lcov.info
- bundle exec brakeman -qAzw1
- bundle exec bundle-audit check --update --ignore CVE-2020-5267
- bundle exec bundle-audit check --update
- bundle exec overcommit --sign
- bundle exec overcommit --run
- bundle exec rake test
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '5.2.4.3'
gem 'rails', '5.2.4.4'

gem 'sprockets'

Expand Down
86 changes: 43 additions & 43 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
GIT
remote: https://github.com/projecttacoma/cqm-parsers.git
revision: 916f63f98beea308928bf64057597a50503df2ea
revision: 5b6d682e925e096443a0379609db995169c00382
branch: bonnie_version
specs:
cqm-parsers (0.2.1.1)
activesupport (~> 5.2.1)
builder (~> 3.1)
cqm-models (~> 3.0.3)
cqm-models (~> 3.0.4)
erubis (~> 2.7.0)
highline (~> 1.7.0)
log4r (~> 1.1.10)
Expand Down Expand Up @@ -43,43 +43,43 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.4.3)
actionpack (= 5.2.4.3)
actioncable (5.2.4.4)
actionpack (= 5.2.4.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.3)
actionpack (= 5.2.4.3)
actionview (= 5.2.4.3)
activejob (= 5.2.4.3)
actionmailer (5.2.4.4)
actionpack (= 5.2.4.4)
actionview (= 5.2.4.4)
activejob (= 5.2.4.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.3)
actionview (= 5.2.4.3)
activesupport (= 5.2.4.3)
actionpack (5.2.4.4)
actionview (= 5.2.4.4)
activesupport (= 5.2.4.4)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.3)
activesupport (= 5.2.4.3)
actionview (5.2.4.4)
activesupport (= 5.2.4.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.3)
activesupport (= 5.2.4.3)
activejob (5.2.4.4)
activesupport (= 5.2.4.4)
globalid (>= 0.3.6)
activemodel (5.2.4.3)
activesupport (= 5.2.4.3)
activerecord (5.2.4.3)
activemodel (= 5.2.4.3)
activesupport (= 5.2.4.3)
activemodel (5.2.4.4)
activesupport (= 5.2.4.4)
activerecord (5.2.4.4)
activemodel (= 5.2.4.4)
activesupport (= 5.2.4.4)
arel (>= 9.0)
activestorage (5.2.4.3)
actionpack (= 5.2.4.3)
activerecord (= 5.2.4.3)
activestorage (5.2.4.4)
actionpack (= 5.2.4.4)
activerecord (= 5.2.4.4)
marcel (~> 0.3.1)
activesupport (5.2.4.3)
activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -131,7 +131,7 @@ GEM
colorize (0.8.1)
commonjs (0.2.7)
concurrent-ruby (1.1.7)
cqm-models (3.0.3)
cqm-models (3.0.4)
cqm-reports (3.1.2)
cqm-models (~> 3.0.3)
cqm-validators (~> 3.0.0)
Expand Down Expand Up @@ -199,7 +199,7 @@ GEM
sprockets (~> 3.0)
libv8 (3.16.14.19)
log4r (1.1.10)
loofah (2.6.0)
loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
macaddr (1.7.2)
Expand All @@ -217,7 +217,7 @@ GEM
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.1)
minitest (5.14.2)
mongo (2.13.0)
bson (>= 4.8.2, < 5.0.0)
mongoid (6.4.5)
Expand All @@ -232,7 +232,7 @@ GEM
net-ssh (6.1.0)
netrc (0.11.0)
newrelic_rpm (6.12.0.367)
nio4r (2.5.2)
nio4r (2.5.3)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
non-stupid-digest-assets (1.0.9)
Expand All @@ -256,18 +256,18 @@ GEM
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.3)
actioncable (= 5.2.4.3)
actionmailer (= 5.2.4.3)
actionpack (= 5.2.4.3)
actionview (= 5.2.4.3)
activejob (= 5.2.4.3)
activemodel (= 5.2.4.3)
activerecord (= 5.2.4.3)
activestorage (= 5.2.4.3)
activesupport (= 5.2.4.3)
rails (5.2.4.4)
actioncable (= 5.2.4.4)
actionmailer (= 5.2.4.4)
actionpack (= 5.2.4.4)
actionview (= 5.2.4.4)
activejob (= 5.2.4.4)
activemodel (= 5.2.4.4)
activerecord (= 5.2.4.4)
activestorage (= 5.2.4.4)
activesupport (= 5.2.4.4)
bundler (>= 1.3.0)
railties (= 5.2.4.3)
railties (= 5.2.4.4)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -286,9 +286,9 @@ GEM
json
require_all (~> 3.0)
ruby-progressbar
railties (5.2.4.3)
actionpack (= 5.2.4.3)
activesupport (= 5.2.4.3)
railties (5.2.4.4)
actionpack (= 5.2.4.4)
activesupport (= 5.2.4.4)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
Expand Down Expand Up @@ -421,7 +421,7 @@ DEPENDENCIES
overcommit
pry
pry-byebug
rails (= 5.2.4.3)
rails (= 5.2.4.4)
rails-controller-testing
rails_best_practices
rest-client
Expand Down
1 change: 0 additions & 1 deletion config/application.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
require "action_controller/railtie"
require "action_mailer/railtie"
require "rails/test_unit/railtie"
require_relative './security_patch_cve20205267'

if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
Expand Down
39 changes: 0 additions & 39 deletions config/security_patch_cve20205267.rb
View file

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"scripts": {},
"dependencies": {
"browserify": "^16.5.1",
"cqm-execution": "^3.0.2",
"cqm-execution": "^3.0.3",
"tinymce": "^5.4.2"
}
}
34 changes: 17 additions & 17 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ base64-js@^1.0.2:
integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==

bl@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.0.tgz#e1a574cdf528e4053019bb800b041c0ac88da493"
integrity sha512-wbgvOpqopSr7uq6fJrLH8EsvYMJf9gzfo2jCsL2eTy75qXPukA4pCgHamOQkZtY5vmfVtjB+P3LNlMHW5CEZXA==
version "2.2.1"
resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5"
integrity sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==
dependencies:
readable-stream "^2.3.5"
safe-buffer "^5.1.1"
Expand Down Expand Up @@ -313,29 +313,29 @@ core-util-is@~1.0.0:
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=

cql-execution@~1.4.4:
version "1.4.4"
resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-1.4.4.tgz#13b1587a7d8739150f25e5c54473d50bf8ab3e81"
integrity sha512-nQQopJ+c6aGcwBvZe9j6Sv1tBK6ZZyn/Ql+jWr4a+y4h59Qbsu1nd+y4+kxVkH75J9d/g/hLxw0IZl9vapTn+Q==
cql-execution@~1.4.5:
version "1.4.5"
resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-1.4.5.tgz#e17364d916cbc78a37994aa4033a95802bd4ab8f"
integrity sha512-ulji08Pl5MzlvTJOUXd0OYlKRfgdOFApdAilvN4FpkcXhk9gwjy4M08jydyqJ8EIH+peSpGuZ3ubRhBUrNEFBQ==
dependencies:
moment "^2.20.1"
ucum "0.0.7"

cqm-execution@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/cqm-execution/-/cqm-execution-3.0.2.tgz#c6cfee9e05656aa33edf217989dfc53306c3c0d6"
integrity sha512-PH835J//mYhtuJ3zpclCH8irhaSNqa26986BAl5w1LNFYGUBXA8PFi29QyI2NaRAeshUHnd++JBxjS110hzjwg==
cqm-execution@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/cqm-execution/-/cqm-execution-3.0.3.tgz#6fd9838c5a88e177018166b80bdc0ac1ddccdba0"
integrity sha512-rBAMrFUE83irYkp13nmbMzZ3aPOgBC8JEBfPdalAz34P9VTl+jCuhwI8YBUT22RlvtPiDE3PmbxBBGDWpH38hg==
dependencies:
cqm-models "~3.0.3"
cqm-models "~3.0.4"
lodash "^4.17.19"
moment "^2.21.0"

cqm-models@~3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/cqm-models/-/cqm-models-3.0.3.tgz#7dfd77ab0a9345b33bfbf5e742b8ac488e70597d"
integrity sha512-soel+GkUFdOX3S9uQb3UY2hLavawCebcdIvSkveFIRyPwatdB5UUWCpWwYZ8j0JsIZGGx7TAHlvjAM0U6Wrl7Q==
cqm-models@~3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/cqm-models/-/cqm-models-3.0.4.tgz#c1b84977f65a953d2640285581eb73b31094f97c"
integrity sha512-MHYS45iSdOiH7t+F4cz3xOvkI2/G4AyhrLQPg0IPRATB3b4uGqB9oBq88Limkq6LljmUjF3gbyn3a7CV5YjbiA==
dependencies:
cql-execution "~1.4.4"
cql-execution "~1.4.5"
mongoose "^5.7.5"

create-ecdh@^4.0.0:
Expand Down

0 comments on commit 590fc62

Please sign in to comment.