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

Rails 5 support #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

chrisbutler
Copy link

hey @jamesdbloom, sorry for creating another PR (#6) but someone here accidentally deleted our fork of your repo

let me know if this PR needs any changes... it would be great to be able to switch back to using a version of your gem instead of a branch of someone else's fork!

spec.add_dependency 'activesupport', '~> 4.1'
spec.add_dependency 'rest-client'
spec.add_dependency 'json', '>= 1.8'
spec.add_dependency 'activesupport', '>= 4.1'
Copy link

Choose a reason for hiding this comment

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

@chrisbutler I think the build here is failing b/c these dependencies were added twice:

spec.add_dependency 'activesupport', '>= 4.1'
spec.add_dependency 'rest-client', '>= 1.7'

- Locking the json to an old version seems uneccessary
- Forcing multi_json and json_pure monkeypatching broke our test suite
- removed the json_pure and so far so good
@chrisbutler
Copy link
Author

@jamesdbloom i made the fix @AJMiller pointed out, and everything is passing now. any chance we can get this merged in?

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