From 0bbca2a398810cc5ec76768333a3690ac11e1fef Mon Sep 17 00:00:00 2001 From: Amie Kuttruff Date: Thu, 10 Apr 2014 10:32:07 -0700 Subject: [PATCH 1/4] updates ruby-yajl to 1.2.0 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b92d7b4..d016a24 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ 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", :require => "yajl" gem "activesupport", "~> 3.0.4" gem "i18n", "~> 0.5.0" # ActiveSupport dependency From bad17139e8b262d443c60f40e1bdedbaf59f5f4f Mon Sep 17 00:00:00 2001 From: Amie Kuttruff Date: Thu, 10 Apr 2014 17:17:32 -0700 Subject: [PATCH 2/4] . --- .gitignore | 1 + Gemfile | 5 ++--- Gemfile.lock | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) 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 d016a24..efd5846 100644 --- a/Gemfile +++ b/Gemfile @@ -3,13 +3,12 @@ source :rubygems gem "faraday", "~> 0.5.7" gem "excon", "~> 0.5.6" -gem "yajl-ruby", "1.2.0", :require => "yajl" +gem "yajl-ruby" 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 From 0b60fc6ae4ce10f2a304e68ffc2d5e90673dd5f8 Mon Sep 17 00:00:00 2001 From: Amie Kuttruff Date: Fri, 11 Apr 2014 09:31:30 -0700 Subject: [PATCH 3/4] updates Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index efd5846..fdf3076 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source :rubygems gem "faraday", "~> 0.5.7" gem "excon", "~> 0.5.6" -gem "yajl-ruby" +gem "yajl-ruby" "~> 1.1.0" gem "activesupport", "~> 3.0.4" gem "i18n", "~> 0.5.0" # ActiveSupport dependency From e9cdd30f42950c320a63e12887a62ab3d9c18337 Mon Sep 17 00:00:00 2001 From: Amie Kuttruff Date: Fri, 11 Apr 2014 09:35:34 -0700 Subject: [PATCH 4/4] updates Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fdf3076..6ca668e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source :rubygems gem "faraday", "~> 0.5.7" gem "excon", "~> 0.5.6" -gem "yajl-ruby" "~> 1.1.0" +gem "yajl-ruby" "1.2.0" gem "activesupport", "~> 3.0.4" gem "i18n", "~> 0.5.0" # ActiveSupport dependency