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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Merge post 2.0.0-beta.5 branches #775

Merged
merged 98 commits into from
Jul 8, 2022
Merged

Merge post 2.0.0-beta.5 branches #775

merged 98 commits into from
Jul 8, 2022

Conversation

maxwondercorn
Copy link
Collaborator

@maxwondercorn maxwondercorn commented Jul 5, 2022 •
edited
Loading

The PR merges branches origin/fw/update-dummy-app and 3.0.0-beta.0 by @Gorzas and @fran-worley. This is work after v2.0.0-beta.5 not merged into master.

I will continue updating the addon after the PR is merged.

edited: Merge only, no release...

donaldwasserman and others added 30 commits October 9, 2018 15:32
@donaldwasserman
replace sendAction with modern callable methods
6e7515b
@donaldwasserman
make easy jquery fixes
9d082e0
@alexander-alvarez
Merge pull request #590 from donaldwasserman/master
3175d84 
replace `sendAction` with modern callable methods
@alexander-alvarez
Release v2.0.0-beta.0
d3bff11
@alexander-alvarez
Merge branch '2-x' of github.com:offirgolan/ember-light-table into 2-x
afbea76
@alexander-alvarez
Release v2.0.0-beta.1
fd18f5b
@donaldwasserman
Merge remote-tracking branch 'upstream/2-x' into feat/remove-jquery
cfc2d90
@donaldwasserman
removed jquery
3035c09
@alexander-alvarez
Merge pull request #593 from donaldwasserman/feat/remove-jquery
9ca4931 
Remove jQuery usage
@Gaurav0
Merge branch 'master' into 2-x
44cf094
@alexander-alvarez
Merge pull request #652 from Gaurav0/merge_master_to_2-x
80d9094 
 Merge branch 'master' into 2-x
@Gaurav0
yarn upgrade
c185cbc
@alexander-alvarez
Merge pull request #654 from Gaurav0/yarn_upgrade
7489b03 
yarn upgrade
@Gaurav0
Update ember-scrollable
64fd817
@Gaurav0
Assert and Test compatibility with LTS 3.4
ca7d417
@Gaurav0
Officially drop support for node 4 in package.json
cb42c02
@alexander-alvarez
Merge pull request #655 from Gaurav0/update_ember_scrollable
5562f23 
Update ember-scrollable
@alexander-alvarez
Merge pull request #657 from Gaurav0/officially_drop_node_4
4b505ac 
Officially drop support for node 4 in package.json
@Gaurav0
Merge branch 'master' into 2-x
8884da7
@alexander-alvarez
Merge pull request #658 from Gaurav0/merge_master_again
c478c19 
Merge branch 'master' into 2-x
@alexander-alvarez
Merge pull request #656 from Gaurav0/update_compatibility
02fdd57 
Assert and Test compatibility with LTS 3.4
@fran-worley
bump vertical-collection to v1.0.0-beta.13
cb989d9
@alexander-alvarez
Merge pull request #672 from fran-worley/2-x
3b5782d 
bump vertical-collection to v1.0.0-beta.13
@fran-worley @alexander-alvarez
Replace merge with assign (#673)
f7f5423 
* bump vertical-collection to v1.0.0-beta.13

* replace merge with assign
@fran-worley @alexander-alvarez
ensure ember-scrollable updates when rows are updated (#677)
38d6b71
@MichalBryxi @alexander-alvarez
refactor: Remove sendAction() calls (#686)
5e0e563
@alexander-alvarez
release 2.0.0-beta.3
4c795df
@mmadsen2 @fran-worley
Replace propertyWillChange/propertyDidChange with notifyPropertyChang…
0da0aa9 
…e and add polyfill for < Ember 3.1 (#692)

Fixes #660
@fran-worley
Merging branch ‘origin/master’ into ‘2-x’
b173a6a
@fran-worley
Merge branch 'master' into 2-x
0ced083
@maxwondercorn maxwondercorn mentioned this pull request Jul 5, 2022
Open
8 tasks
@RobbieTheWagner
Copy link
Member

@maxwondercorn could we also add a GitHub actions setup to run tests please? I would like to make sure tests are passing before merging.

@maxwondercorn
Copy link
Collaborator Author

maxwondercorn commented Jul 5, 2022 •
edited
Loading

Yes, I will set that up

@rwwagner90
Forgot I didn't have permissions on this repo so I can't setup actions atm. IIRC, I need to ask @melanie#1618 on Discord. Will ping when they're setup -thanks

maxwondercorn and others added 3 commits July 6, 2022 12:49
@RobbieTheWagner
Copy link
Member

@maxwondercorn looks like we have a lot of lint failures. Can you please disable those rules or address the issues?

@maxwondercorn
Copy link
Collaborator Author

The rules were prematurely removed in one of the merged branches. Will fix or add them back.

Also working on Ember 3.20 failing tests

maxwondercorn added 5 commits July 7, 2022 11:08
@maxwondercorn
Copy link
Collaborator Author

@rwwagner90

Tests are passing in CI. 🎉 Still a lot of work to do but this is a good starting point to continue from

I need to figure out testing differences between local and GitHub actions. Using ember-try locally the embroider tests pass but not in CI. Locally 3.20 source tests fail but pass in CI 🤷

@RobbieTheWagner RobbieTheWagner merged commit 71411bf into adopted-ember-addons:master Jul 8, 2022
@RobbieTheWagner
Copy link
Member

Merged and marked as breaking just in case. Thanks for doing this!

@maxwondercorn maxwondercorn deleted the merge-post-beta5 branch July 8, 2022 19:22
@maxwondercorn
Copy link
Collaborator Author

Thanks for merge. I will keep working on this. I have repo access now but will still put PR's for review and merge as needed.

@maxwondercorn maxwondercorn mentioned this pull request Jul 11, 2022
Closed
@maxwondercorn maxwondercorn mentioned this pull request Jul 30, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
breaking
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.