Skip to content

Security vulnerabilities addressed#754

Merged
armahillo merged 4 commits into
rubyforgood:726-security-fixesfrom
loyno-mathcs:security
Mar 30, 2019
Merged

Security vulnerabilities addressed#754
armahillo merged 4 commits into
rubyforgood:726-security-fixesfrom
loyno-mathcs:security

Conversation

@trevordocherty
Copy link
Copy Markdown

@trevordocherty trevordocherty commented Mar 25, 2019

Resolves #726

Description

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • Documentation update

How Has This Been Tested?

Screenshots

@armahillo
Copy link
Copy Markdown
Collaborator

Had 2 small merge conflicts in Gemfile.lock -- I resolved them. Will merge this, pending green CI. :)

TY @trevordocherty !

@armahillo armahillo changed the base branch from master to 726-security-fixes March 30, 2019 19:25
@armahillo
Copy link
Copy Markdown
Collaborator

I'm merging this against a local branch in this repo -- we had a couple conflicts with upstream that aren't specifically related to your changes; I'll handle those. 👍 merging and closing this one, thank you!

@armahillo armahillo merged commit acdd539 into rubyforgood:726-security-fixes Mar 30, 2019
@armahillo armahillo added Loyola Issues tagged for contributors from Loyola University Repo First-timer This Pull Request is a user's first contribution to Diaperbase labels May 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Loyola Issues tagged for contributors from Loyola University Repo First-timer This Pull Request is a user's first contribution to Diaperbase

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants