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

updates ruby-yajl to 1.2.0 #12

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

updates ruby-yajl to 1.2.0 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bbca2a
updates ruby-yajl to 1.2.0
akuttruff Apr 10, 2014
bad1713
.
akuttruff Apr 11, 2014
0b60fc6
updates Gemfile
akuttruff Apr 11, 2014
e9cdd30
updates Gemfile
akuttruff Apr 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
credentials.yml
NOTES.md
*.gem
*~
Copy link
Owner

Choose a reason for hiding this comment

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

Same here.

5 changes: 2 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ source :rubygems
gem "faraday", "~> 0.5.7"

gem "excon", "~> 0.5.6"
gem "yajl-ruby", "~> 0.8.1", :require => "yajl"
gem "yajl-ruby" "1.2.0"
Copy link

Choose a reason for hiding this comment

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

This will need to get updated in the gemspec as well and you'll probably want to loosen the dependency up a bit. ~> 1.2.0 would be better

Copy link
Owner

Choose a reason for hiding this comment

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

The comma was removed here and needs to be added back.

Also agree that the we want to keep the ~> specification.


gem "activesupport", "~> 3.0.4"
gem "i18n", "~> 0.5.0" # ActiveSupport dependency

group :development do
gem "bundler", "~> 1.0.0"
gem "rake", "~> 0.8.7"
gem "rspec", "2.1.0"
end
end
Copy link
Owner

Choose a reason for hiding this comment

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

Please add the newline back, thanks!

5 changes: 2 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@ GEM
rspec-expectations (2.1.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.1.0)
yajl-ruby (0.8.1)
yajl-ruby (1.2.0)

PLATFORMS
ruby

DEPENDENCIES
activesupport (~> 3.0.4)
bundler (~> 1.0.0)
excon (~> 0.5.6)
faraday (~> 0.5.7)
i18n (~> 0.5.0)
rake (~> 0.8.7)
rspec (= 2.1.0)
yajl-ruby (~> 0.8.1)
yajl-ruby