Skip to content
This repository has been archived by the owner. It is now read-only.

Vendor latest thor's master #7471

Merged
1 commit merged into from Dec 6, 2019
Merged

Vendor latest thor's master #7471

1 commit merged into from Dec 6, 2019

Conversation

deivid-rodriguez
Copy link
Member

@deivid-rodriguez deivid-rodriguez commented Dec 6, 2019

What was the end-user problem that led to this PR?

The problem was that I need to pull some changes from latest thor master to avoid loading the uri library for #7460.

What is your fix for the problem, implemented in this PR?

My fix is to run bin/rake vendor:thor[master] and commit changes.

Not that I used an automatiek version including segiddins/automatiek#7 that avoids some false positive when replacing namespaces.

@deivid-rodriguez
Copy link
Member Author

deivid-rodriguez commented Dec 6, 2019

Just updating upstream changes, and no issues found, so merging.

@bundlerbot merge

ghost pushed a commit that referenced this issue Dec 6, 2019
7471: Vendor latest thor's master r=deivid-rodriguez a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that I need to pull some changes from latest `thor` master to avoid loading the `uri` library for #7460.

### What is your fix for the problem, implemented in this PR?

My fix is to run `bin/rake vendor:thor[master]` and commit changes.

Not that I used an `automatiek` version including segiddins/automatiek#7 that avoids some false positive when replacing namespaces. 

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

ghost commented Dec 6, 2019

Build succeeded

@ghost ghost merged commit 2a491ad into master Dec 6, 2019
3 checks passed
@ghost ghost deleted the bump_thor branch Dec 6, 2019
@deivid-rodriguez deivid-rodriguez modified the milestones: 2.1.0.rc, 2.1.0 Dec 13, 2019
deivid-rodriguez pushed a commit that referenced this issue Dec 13, 2019
7471: Vendor latest thor's master r=deivid-rodriguez a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that I need to pull some changes from latest `thor` master to avoid loading the `uri` library for #7460.

### What is your fix for the problem, implemented in this PR?

My fix is to run `bin/rake vendor:thor[master]` and commit changes.

Not that I used an `automatiek` version including segiddins/automatiek#7 that avoids some false positive when replacing namespaces.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
(cherry picked from commit 2559589)
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant