fix: Resolves merge conflicts with 2.0->master #372
Merged
Conversation
This file contains hidden or 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
…ing role to access Dashboard (#215)
## [1.22.3](v1.22.2...v1.22.3) (2020-05-16) ### Bug Fixes * **dashboard:** Fixes security vulnerability that allowed event_tracking role to access Dashboard ([#215](#215)) ([](74a40ad)) ### Styles * **check-in:** Changes table header to be more descriptive ([#207](#207)) ([](889fbd0)) * **config:** Removes unused event_is_over flag ([#208](#208)) ([](0c73e66))
* build(deps): Upgrade yarn * build(deps): Upgrade gems * build(deps): Remove obsolete gems * v0.0.0 * build(deps): Update semantic-release * fix(questionnaire): visual bug in school autocomplete school dropdown the css was set for an "a" tag when the list was made up of divs so I switched the css to work for the "div" tag in the autocomplete * fix(questionnaire): visual bug in school autocomplete school dropdown the css was set for an "a" tag when the list was made up of divs so I switched the css to work for the "div" tag in the autocomplete. I also hide a element that was not present earlier * build(deps): Upgrades Rails to 5.2.4.3 * build(deps): Upgrades gems Co-authored-by: Jeremy Rudman <jeremyrudman@gmail.com>
Bumps [puma](https://github.com/puma/puma) from 4.3.4 to 4.3.5. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…odified by a deleted admin (#236)
## [1.22.4](v1.22.3...v1.22.4) (2020-05-26) ### Bug Fixes * **questionnaire:** Fixes error when trying to view a questionnaire modified by a deleted admin ([#236](#236)) ([](2ffe116))
* build(deps): Bump websocket-extensions from 0.1.4 to 0.1.5 Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5. - [Release notes](https://github.com/faye/websocket-extensions-ruby/releases) - [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md) - [Commits](faye/websocket-extensions-ruby@0.1.4...0.1.5) Signed-off-by: dependabot[bot] <support@github.com> * build(deps): Updates websocket-extensions gem cache Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chris Baudouin, Jr <chrisbaudouinjr@icloud.com>
* build(deps): Bump rack from 2.2.2 to 2.2.3 Bumps [rack](https://github.com/rack/rack) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](rack/rack@v2.2.2...2.2.3) Signed-off-by: dependabot[bot] <support@github.com> * Adds rack gem cache Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chris Baudouin, Jr <chrisbaudouinjr@icloud.com>
Bumps [npm](https://github.com/npm/cli) from 6.14.5 to 6.14.6. - [Release notes](https://github.com/npm/cli/releases) - [Changelog](https://github.com/npm/cli/blob/latest/CHANGELOG.md) - [Commits](npm/cli@v6.14.5...v6.14.6) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.15...4.17.19) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/ankane/chartkick/releases) - [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md) - [Commits](ankane/chartkick@v3.3.1...v3.4.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
peterkos
approved these changes
Sep 21, 2020
sman591
pushed a commit
that referenced
this pull request
Sep 21, 2020
# [1.23.0](v1.22.4...v1.23.0) (2020-09-21) ### Bug Fixes * CodeClimate 2.0 fixes ([#374](#374)) ([](746bbfc)) * Fixes failing test cases from [#242](#242) ([#364](#364)) ([](113cd61)) * Fixes various Hound issues for 2.0 ([#370](#370)) ([](434cfb3)) * Resolves merge conflicts with 2.0->master ([#372](#372)) ([](eae9926)), closes [#215](#215) [#215](#215) [#207](#207) [#208](#208) [#212](#212) [#219](#219) [#221](#221) [#236](#236) [#236](#236) [#250](#250) [#268](#268) [#280](#280) [#282](#282) [#298](#298) * **config:** Removes disable_account_registration from database ([#247](#247)) ([](82a7ff4)) * **dashboard:** Map data refactored for faster load times ([#269](#269)) ([](03e632c)) * **dashboard:** Switches map to use different geocoder, reenables map ([#224](#224)) ([](30e3a2f)) * **Dashboard:** Fixes missing location data in map ([#324](#324)) ([](388c9bd)) * **deps:** Updates the locked Ruby version ([#340](#340)) ([](e0e537c)) * **docs:** Refactors page titles and makes API pages visible again ([#320](#320)) ([](8617981)) * **questionnaire:** added phone number requirements ([#283](#283)) ([](09167ae)) * Hackathon names now consistently on newline, wrapping is centered ([#358](#358)) ([](2e9379f)) * School text-box dropdown in manage/questionnaires/edit missing background ([#296](#296)) ([](c9d6658)) * Text centering on application page ([#361](#361)) ([](0237965)) * **bus_captain:** Alerts admins if a bus captain is removed ([#270](#270)) ([](28913f7)) * Shows manage button for admin_limited_access ([#331](#331)) ([](cb16869)) * **login:** Removes always visible login error ([#263](#263)) ([](513e1c2)) * **questionnaire:** Fixes error when trying to view a questionnaire modified by a deleted admin ([#238](#238)) ([](f07ec28)), closes [#215](#215) [#215](#215) [#207](#207) [#208](#208) [#212](#212) [#219](#219) [#221](#221) * **questionnaire:** School autocomplete matches form field width ([#278](#278)) ([](e4169a7)) ### Code Refactoring * `first_name` and `last_name` move from `questionnaire` to `user` ([#241](#241)) ([](6266f5a)), closes [#244](#244) [#downwith2](https://github.com/codeRIT/hackathon-manager/issues/downwith2) [#222](#222) [#273](#273) [#215](#215) [#215](#215) [#207](#207) [#208](#208) [#212](#212) [#219](#219) [#221](#221) [#236](#236) [#236](#236) [#250](#250) [#268](#268) [#263](#263) [#275](#275) [#235](#235) [#247](#247) [#238](#238) [#215](#215) [#215](#215) [#207](#207) [#208](#208) [#212](#212) [#219](#219) [#221](#221) [#329](#329) [#326](#326) [#324](#324) [#291](#291) [#272](#272) [#278](#278) * Adds GSDP info, cleans Dokku docs ([#356](#356)) ([](54d2cea)) * Changes "Applications" to "Questionnaires" in map ([#326](#326)) ([](675b3f6)) * Cleans Questionnaire for MyMLH V3 ([#338](#338)) ([](31b418d)) * Cleans update method in rsvps_controller ([#305](#305)) ([](fe66870)) * Redesigns password reset pages ([#308](#308)) ([](69e8d6e)) * Renames "Guides" to "Docs" ([#353](#353)) ([](12cc746)) * Renames user roles, improves security ([](58b5849)) * **config:** Adjusts registration verbiage to always allow user registration ([#232](#232)) ([](1a31861)) * **docs:** Updates Environment Variable docs ([#300](#300)) ([](1599fe1)) * Updates 24hr reminder to remove MyMLH reference ([#302](#302)) ([](9e6fe39)) * **docs:** Updates Messages and customization instructions ([#321](#321)) ([](a767446)) * **questionnaire:** No longer deletes user with questionnaire ([#287](#287)) ([](ac720d9)) * **skylight:** Removes Skylight ([#249](#249)) ([](2808058)) ### Documentation * Add guide for local API setup, update api-usage slightly ([#235](#235)) ([](d1a01f8)) * Migration guide for 2.0 ([#368](#368)) ([](3745d9c)), closes [#283](#283) [#296](#296) [#242](#242) [#364](#364) [#361](#361) [#270](#270) [#175](#175) [#215](#215) [#215](#215) [#207](#207) [#208](#208) [#212](#212) [#358](#358) ### Features * Automatically remind people to RSVP ([#175](#175)) ([](d87269d)), closes [#215](#215) [#215](#215) [#207](#207) [#208](#208) [#212](#212) * Creates /user.json get route ([#367](#367)) ([](a9e14f5)) * Updates HackathonManager to 2.0 ([](0070cd4)) * **Dashboard:** Redesigns sidebar with category labels ([#290](#290)) ([](abcf634)) * **docs:** Adds new Resources page ([#318](#318)) ([](9c61d1f)) * **docs:** Initial documentation for 2.0 ([#291](#291)) ([](a062140)) * **messages:** Adds a confirmation modal to send messages ([#272](#272)) ([](79831f6)) * **messages:** Transitions from SparkPost to SendGrid ([#285](#285)) ([](5e96a9c)) * **questionnaires:** Allows directors to block new questionnaires ([#279](#279)) ([](5e03082)) * Updates MyMLH to V3 ([#329](#329)) ([](ede300f)) * **users:** Adds ability to view all users and admins ([#216](#216)) ([](c119c9a))
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.
fixes #371