fix: Resolves merge conflicts with 2.0->master#372

Merged

peterkos merged 14 commits into2.0from

Sep 21, 2020

Commits on May 16, 2020

fix(dashboard): Fixes security vulnerability that allowed event_tracking role to access Dashboard (#215)
cbaudouinjr
authored
chore(release): 1.22.3 [skip ci]
semantic-release-bot
committed

Commits on May 19, 2020

build(deps): Upgrade yarn (#212)

cbaudouinjr
and
JeremyRudman
authored

Commits on May 23, 2020

Commits on May 26, 2020

fix(questionnaire): Fixes error when trying to view a questionnaire modified by a deleted admin (#236)
cbaudouinjr
authored
chore(release): 1.22.4 [skip ci]
semantic-release-bot
committed

Commits on Jun 11, 2020

build(deps): Bump websocket-extensions from 0.1.4 to 0.1.5 (#250)

dependabot[bot]
and
cbaudouinjr
authored

Commits on Jun 24, 2020

build(deps): Bump rack from 2.2.2 to 2.2.3 (#268)

dependabot[bot]
and
cbaudouinjr
authored

Commits on Jul 17, 2020

Commits on Aug 12, 2020

build(deps): Bump chartkick from 3.3.1 to 3.4.0 (#298)
dependabot[bot]
authored

Commits on Sep 21, 2020