diff --git a/.gitignore b/.gitignore index 0b178d2..368413b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ credentials.yml NOTES.md *.gem +*~ \ No newline at end of file diff --git a/Gemfile b/Gemfile index b92d7b4..6ca668e 100644 --- a/Gemfile +++ b/Gemfile @@ -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" 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 \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 12f340c..05c6f42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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