Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Move on to bundler 3 #6957

Merged
6 commits merged into from Apr 11, 2019
Merged

Move on to bundler 3 #6957

6 commits merged into from Apr 11, 2019

Conversation

colby-swandale
Copy link
Member

This PR contains the merge of 2-0-stable to master

@deivid-rodriguez deivid-rodriguez mentioned this pull request Feb 10, 2019
Closed
@deivid-rodriguez deivid-rodriguez changed the title Colby/bundler 2 merge Merge 2-0-stable into master Feb 10, 2019
@colby-swandale colby-swandale changed the title Merge 2-0-stable into master [wip] Merge 2-0-stable into master Feb 13, 2019
@colby-swandale
Copy link
Member Author

Note: please don't merge this yet

@colby-swandale colby-swandale force-pushed the colby/bundler-2-merge branch 3 times, most recently from 74b6d33 to c07ce40 Compare February 20, 2019 12:10
@colby-swandale colby-swandale changed the title [wip] Merge 2-0-stable into master Merge 2-0-stable into master Feb 21, 2019
deivid-rodriguez
deivid-rodriguez suggested changes Feb 21, 2019
View reviewed changes
.travis.yml Outdated Show resolved Hide resolved
@colby-swandale colby-swandale force-pushed the colby/bundler-2-merge branch 10 times, most recently from 063220f to 577b522 Compare February 23, 2019 15:11
deivid-rodriguez
deivid-rodriguez reviewed Feb 23, 2019
View reviewed changes
.travis.yml Outdated Show resolved Hide resolved
@colby-swandale colby-swandale mentioned this pull request Feb 26, 2019
Closed
@colby-swandale colby-swandale force-pushed the colby/bundler-2-merge branch 2 times, most recently from 83efcc7 to c7f1a37 Compare February 27, 2019 09:47
@deivid-rodriguez deivid-rodriguez mentioned this pull request Feb 27, 2019
Merged
@deivid-rodriguez deivid-rodriguez mentioned this pull request Feb 28, 2019
Merged
@deivid-rodriguez deivid-rodriguez force-pushed the colby/bundler-2-merge branch 2 times, most recently from d046a1d to faf9068 Compare February 28, 2019 14:57
@deivid-rodriguez
Copy link
Member

I gave this PR a final pass, cleaned up commit history, and change the title of the PR to better communicate what we are actually working on here.

This is ready from my side. As I said before, there's a couple of commits (18f5751 and 9e3876c) that I considered to introduce separately, but I understand this has already taken too long, so I'm good with this.

@colby-swandale
Copy link
Member Author

This looks good! Lets get this is now so that we don't get caught up in another merge conflict.

@bundlerbot r+

ghost pushed a commit that referenced this pull request Apr 5, 2019
@bundlerbot @deivid-rodriguez
Merge #6957
f4685ef 
6957: Move on to bundler 3 r=colby-swandale a=colby-swandale

This PR contains the merge of `2-0-stable` to `master`

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
@ghost
Copy link

ghost commented Apr 5, 2019

Build failed

@deivid-rodriguez
Copy link
Member

Great, let me fix the build and we try again.

@deivid-rodriguez
Copy link
Member

Got caught by another merge, let me rebase.

@deivid-rodriguez
Copy link
Member

I started rebasing this PR, but I got a new spec failure after the rebase. It should get fixed by #7057, so I'll wait till that one is merged and then get this one finally ready.

@hsbt
Copy link
Member

hsbt commented Apr 9, 2019

@deivid-rodriguez Thanks to your hard work.

I think this pull-request should be merged at first with related pull-requests. It seems you are working to resolve conflicts every-day.

@deivid-rodriguez
Copy link
Member

Since I'm usually involved in the other PRs that get merged, resolving conflicts is fast and not a problem for me. Also, the other PRs have been useful for finding out problems in this PR and making it easier to digest. So, I don't think this is a problem.

In any case, the PR is ready to merge as soon as CI is green. Let me rebase it now.

@deivid-rodriguez
Copy link
Member

It's rebased now. The failure we are getting is the one I mentioned earlier, and that should get "fixed" by #7057.

@indirect
Copy link
Member

I'm 👍 on #7057, let's do this!

@bundlerbot r+

@ghost
Copy link

ghost commented Apr 11, 2019

Merge conflict (retrying...)

ghost pushed a commit that referenced this pull request Apr 11, 2019
@bundlerbot @deivid-rodriguez
Merge #6957
7ddf173 
6957: Move on to bundler 3 r=indirect a=colby-swandale

This PR contains the merge of `2-0-stable` to `master`

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
@ghost
Copy link

ghost commented Apr 11, 2019

Build failed

@deivid-rodriguez
Copy link
Member

Rebased hopefully one last time 🤞.

@deivid-rodriguez
Copy link
Member

@bundlerbot r=indirect

ghost pushed a commit that referenced this pull request Apr 11, 2019
@bundlerbot @deivid-rodriguez
Merge #6957
b711410 
6957: Move on to bundler 3 r=indirect a=colby-swandale

This PR contains the merge of `2-0-stable` to `master`

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
@ghost
Copy link

ghost commented Apr 11, 2019

Build succeeded

@ghost ghost merged commit b9baa34 into master Apr 11, 2019
@ghost ghost deleted the colby/bundler-2-merge branch April 11, 2019 12:57
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deivid-rodriguez deivid-rodriguez deivid-rodriguez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@colby-swandale @deivid-rodriguez @hsbt @indirect