Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ember 3.6 #107

Merged
merged 9 commits into from
Feb 27, 2020
Merged

Ember 3.6 #107

merged 9 commits into from
Feb 27, 2020

Conversation

Matthijsy
Copy link
Contributor

Summary

My previous PR was a bit too ambitious, still some stuff was broken. This PR looks like to work better. 馃巿

# Conflicts:
#	.template-lintrc.js
#	.travis.yml
#	README.md
# Conflicts:
#	README.md
#	tests/unit/components/form/response/response-form-test.js
#	tests/unit/components/poll/status-tag-test.js
#	tests/unit/components/tools/upcoming-birthdays-test.js
#	tests/unit/controllers/groups/edit-test.js
#	yarn.lock
Copy link
Contributor

@RubenSmit RubenSmit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dit is inderdaad kei veel, maar heb geen rare dingen gespot. Lekker bezig!

@Matthijsy Matthijsy merged commit 680f43a into staging Feb 27, 2020
@Matthijsy Matthijsy deleted the ember-3.6 branch February 27, 2020 17:20
RubenSmit pushed a commit to RubenSmit/amber-ui that referenced this pull request Sep 10, 2023
* Remove rqrcode and versionist, since they are not used anywhere

* Remove dmarc since not used anymore

* Move factory_bot and facker to test gems, since those are not needed in prod

* Remove mail, was used in old mailsystem but not anymore

* Only pin all gems on major version

* Upgrade ruby version
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.

None yet

2 participants