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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies. #242

Merged
merged 1 commit into from
Jan 12, 2018
Merged

Upgrade dependencies. #242

merged 1 commit into from
Jan 12, 2018

Conversation

icarito
Copy link
Member

@icarito icarito commented Jan 4, 2018

Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!

  • tests pass -- rake test
  • code has been rebased on top of latest master (check if another pull request was added recently, and please rebase)
  • pull request is descriptively named and, if possible, multiple commits squashed if they're smaller changes

Thanks!

@icarito
Copy link
Member Author

icarito commented Jan 4, 2018

This seems to be blocking on an unrelated issue? (bower dependency on cartagen)

@jywarren
Copy link
Member

jywarren commented Jan 4, 2018

OK, taking a look now.

@jywarren
Copy link
Member

jywarren commented Jan 4, 2018

Yeah, um... leaflet version mismatch... it's trying to get v1.x but we explicitly set v0.7.x pending publiclab/Leaflet.DistortableImage#79, which seems pretty close.

I'm going to explore both options -- completing publiclab/Leaflet.DistortableImage#79 and also seeing if we can peg something else to an earlier pre- v1.x leaflet.

@jywarren
Copy link
Member

jywarren commented Jan 4, 2018

OK, publiclab/Leaflet.DistortableImage#79 is complete; i'm updating the dep and running bower update to check if that resolves things. I'll open a new PR but this is taking a long time bc my main internet connection is out.

@jywarren
Copy link
Member

jywarren commented Jan 4, 2018

OK, opened in #243

@jywarren
Copy link
Member

jywarren commented Jan 4, 2018

That passed and I'm testing it locally before merging.

@jywarren jywarren closed this Jan 12, 2018
@jywarren jywarren reopened this Jan 12, 2018
@jywarren
Copy link
Member

Rebased this... let's see!

@jywarren
Copy link
Member

Looks good to me!

@jywarren jywarren merged commit 4b26fbb into master Jan 12, 2018
@emilyashley emilyashley deleted the dep_update branch January 15, 2020 22:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants