Skip to content

[pull] master from freeCodeCamp:master#442

Merged
pull[bot] merged 30 commits intoMu-L:masterfrom
freeCodeCamp:master
Dec 30, 2020
Merged

[pull] master from freeCodeCamp:master#442
pull[bot] merged 30 commits intoMu-L:masterfrom
freeCodeCamp:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Dec 27, 2020

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Dec 27, 2020
dependabot bot and others added 27 commits December 27, 2020 05:25
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.18 to 3.1.20.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](ai/nanoid@3.1.18...3.1.20)

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [axios](https://github.com/axios/axios) from 0.21.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](axios/axios@v0.21.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](microsoft/TypeScript@v4.1.2...v4.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Randell Dawson <5313213+RandellDawson@users.noreply.github.com>
Co-authored-by: Nicholas Carrigan (he/him) <nhcarrigan@gmail.com>
…40498)

* feat: add donation options to donors alert and donation page footer

* Update client/src/components/Donation/DonationOptionsText.js

Co-authored-by: Shaun Hamilton <51722130+ShaunSHamilton@users.noreply.github.com>

* Update client/src/components/Donation/DonationOptionsText.js

Co-authored-by: Shaun Hamilton <51722130+ShaunSHamilton@users.noreply.github.com>

* fix: clean up

* fix: remove comments

* feat: make the component declerative

* feat: move donation text components to one component

* feat: add cypress tests for donate page

* Update cypress/integration/learn/donate/donate-page-default.js

Co-authored-by: Shaun Hamilton <51722130+ShaunSHamilton@users.noreply.github.com>
Co-authored-by: Kris Koishigawa <scissorsneedfoodtoo@gmail.com>
Co-authored-by: Tom <20648924+moT01@users.noreply.github.com>
Replaces the references to the old Travis CI
flow with updated information for the GitHub
actions flow, and handles a couple of typo fixes.

Signed-off-by: nhcarrigan <nhcarrigan@gmail.com>
Co-authored-by: Randell Dawson <5313213+RandellDawson@users.noreply.github.com>
Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
@pull pull bot merged commit 26c9b3c into Mu-L:master Dec 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants