This repository has been archived by the owner on Jul 14, 2022. It is now read-only.
forked from avalonmediasystem/avalon
ERA A+V upgrade to Avalon 6.5.0 - step 6 of 6: security updates #621
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
* [Security] Bump rack from 1.6.11 to 1.6.12 Bumps [rack](https://github.com/rack/rack) from 1.6.11 to 1.6.12. **This update includes a security fix.** - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](rack/rack@1.6.11...1.6.12) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * update changelog for PR ualbertalib#593 Co-authored-by: Jeffery Antoniuk <jefferya@ualberta.ca>
* yarn audit used to identify * package.json resolution added to avoid forking upstream: * see avalonmediasystem/avalon@e6e3c1a * bump webpacker to 4.2.2 * bump rack to 2.0.9 (problems if a newer version used as the returned datastructure changes here: https://github.com/avalonmediasystem/avalon/blob/v6.5.0/app/controllers/auth_forms_controller.rb#L41) * bump rack-cors 1.0.5 * bump nokogiri 1.10.9
jefferya
changed the title
[WIP] Merge tag 'v6.5.0' of upstream into local 'v6.4.3'
[WIP] ERA A+V upgrade to Avalon 6.5.0 - step 6 of n - security updates
Apr 1, 2020
jefferya
changed the title
[WIP] ERA A+V upgrade to Avalon 6.5.0 - step 6 of n - security updates
[WIP] ERA A+V upgrade to Avalon 6.5.0 - step 6 of 6 - security updates
Apr 1, 2020
Bumps [json](https://github.com/flori/json) from 2.1.0 to 2.3.0. **This update includes a security fix.** - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](flori/json@v2.1.0...v2.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
jefferya
force-pushed
the
update/avalon-6.5.0
branch
from
April 3, 2020 16:57
ffaa35c
to
c68b0ef
Compare
…b/avalon into update/avalon-6.5.0
- SETTINGS__TIMELINER__TIMELINER_URL
jefferya
changed the title
[WIP] ERA A+V upgrade to Avalon 6.5.0 - step 6 of 6 - security updates
ERA A+V upgrade to Avalon 6.5.0 - step 6 of 6: security updates
May 12, 2020
jefferya
commented
May 12, 2020
Comment on lines
+18
to
+29
"resolutions": { | ||
"axios": "^0.18.1", | ||
"elliptic": "^6.5.2", | ||
"fstream": "^1.0.12", | ||
"js-yaml": "^3.13.1", | ||
"lodash": "^4.17.15", | ||
"lodash.template": "^4.5.0", | ||
"lodash.mergewith": "^4.6.2", | ||
"mixin-deep": "^1.3.2", | ||
"mkdirp": "^0.5.4", | ||
"serialize-javascript": "^2.1.1", | ||
"set-value": "^2.0.1" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
package.json resolution section added building on upstream's usage
* see avalonmediasystem/avalon@e6e3c1a
mbarnett
approved these changes
May 13, 2020
jefferya
added a commit
that referenced
this pull request
May 13, 2020
* update audio_waveform-ruby to 2.3
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Step 6 of the ERA A+V Avalon update to 6.5.0. Meant to be combined with several other steps to produce a working ERA A+V
This step: