Bonnie version merge #72
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rk from master. (#39) * Fixed SDC loading to work with newer DRC measures. - Fixed issues with most data criteria getting thrown out. * Bring over dependabot nokogiri update and the simplexml_parser removal from #30. [Security] Update nokogiri requirement from ~> 1.8.5 to >= 1.8.5, < 1.11.0 Updates the requirements on [nokogiri](https://github.com/sparklemotion/nokogiri) to permit the latest version. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.8.5...v1.10.3) * Add the hqmf identifier to a statement reference (#25)
…1.0 (#67) * [Security] Update rubyzip requirement from ~> 1.2.2 to >= 1.2.2, < 2.1.0 Updates the requirements on [rubyzip](https://github.com/rubyzip/rubyzip) to permit the latest version. - [Release notes](https://github.com/rubyzip/rubyzip/releases) - [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md) - [Commits](rubyzip/rubyzip@v1.2.3...v2.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Updated rubyzip dependency to be less than version 2.x, which requires ruby 2.4
…ages Fixed vulnerability: sparklemotion/nokogiri#1943
* Updated version of bonnie_version cqm-parser branch * Updated cqm-parser (binnie_viersion branch)
# Conflicts: # Gemfile # Gemfile.lock # cqm-parsers.gemspec # lib/hqmf-parser/cql/document_helpers/doc_population_helper.rb # lib/measure-loader/source_data_criteria_loader.rb # test/unit/measure-loader/cql_loader_test.rb
Codecov Report
@@ Coverage Diff @@
## master #72 +/- ##
=========================================
+ Coverage 82.37% 82.4% +0.02%
=========================================
Files 69 69
Lines 4313 4320 +7
=========================================
+ Hits 3553 3560 +7
Misses 760 760
Continue to review full report at Codecov.
|
adongare
approved these changes
Feb 5, 2020
dczulada
approved these changes
Feb 6, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request pulls in all changes from bonnie_version to ensure these changes can be released from master. This also discards changes on master that upgrade cqm-parsers to use Rails 5.2 (including dependency changes and required code changes). The Rails upgrade changes will be added to master again for later versions of cqm-parsers.
Pull requests into cqm-parsers require the following. Submitter and reviewer should ✅ when done. For items that are not-applicable, note it's not-applicable ("N/A") and ✅.
Submitter:
Reviewer 1:
Name: David Czulada
Reviewer 2:
Name: (Semantic Bits)