Pinned to older version of octokit and faraday gems to fix errors with Github API

just3ws · just3ws · commit ecca52a88904 · 2014-06-03T23:04:30.000-05:00
diff --git a/Gemfile b/Gemfile
@@ -107,6 +107,8 @@ gem 'awesome_print'
 # Hangup on long calls
 gem 'rack-timeout'
 
+gem 'faraday', '~> 0.8.1'
+
 # ----------------
 
 gem 'rocket_tag'
@@ -125,7 +127,7 @@ gem 'mail'
 gem 'mini_magick'
 gem 'mixpanel'
 gem 'never_wastes'
-gem 'octokit'
+gem 'octokit', '~> 1.23.0'
 gem 'pubnub', '0.1.9'
 gem 'querystring'
 gem 'rails_autolink'
@@ -147,8 +149,8 @@ group :development do
   gem 'guard-rspec'
   gem 'spring'
   gem 'spring-commands-rspec'
-  gem 'travis'
-  gem 'travis-lint'
+  #gem 'travis'
+  #gem 'travis-lint'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -78,7 +78,6 @@ GEM
       ejs
       jquery-rails
       rails (>= 3.1)
-    backports (3.6.0)
     barber (0.1.2)
       execjs
     better_errors (1.1.0)
@@ -168,8 +167,6 @@ GEM
     equalizer (0.0.9)
     erubis (2.7.0)
     escape (0.0.4)
-    ethon (0.7.0)
-      ffi (>= 1.3.0)
     eventmachine (1.0.0)
     excon (0.32.0)
     execjs (1.4.0)
@@ -178,8 +175,8 @@ GEM
     fakefs (0.4.2)
     faker (1.1.2)
       i18n (~> 0.5)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
     feedjira (1.2.0)
@@ -208,13 +205,6 @@ GEM
       rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 1.0)
     geocoder (1.1.4)
-    gh (0.13.2)
-      addressable
-      backports
-      faraday (~> 0.8)
-      multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
-      net-http-pipeline
     github-markdown (0.6.5)
     grackle (0.2.1)
       json
@@ -250,7 +240,6 @@ GEM
     heroku-api (0.3.17)
       excon (~> 0.27)
       multi_json (~> 1.8.2)
-    highline (1.6.21)
     hike (1.2.3)
     hirb (0.7.1)
     hiredis (0.4.5)
@@ -337,9 +326,7 @@ GEM
     mono_logger (1.1.0)
     multi_json (1.8.4)
     multi_xml (0.5.1)
-    multipart-post (2.0.0)
-    net-http-persistent (2.9.4)
-    net-http-pipeline (1.0.1)
+    multipart-post (1.2.0)
     net-ssh (2.6.1)
     netrc (0.7.7)
     never_wastes (0.0.6)
@@ -363,8 +350,13 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    octokit (3.1.0)
-      sawyer (~> 0.5.3)
+    octokit (1.23.0)
+      addressable (~> 2.2)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.9)
+      hashie (~> 1.2)
+      multi_json (~> 1.3)
+      netrc (~> 0.7.7)
     oj (2.5.5)
     omniauth (1.1.1)
       hashie (~> 1.2)
@@ -415,9 +407,6 @@ GEM
     pubnub (0.1.9)
       em-http-request (>= 1.0.2)
       json
-    pusher-client (0.6.0)
-      json
-      websocket (~> 1.0)
     querystring (0.1.0)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
@@ -517,9 +506,6 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sawyer (0.5.4)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
     sax-machine (0.2.1)
       nokogiri (~> 1.6.0)
     selenium-webdriver (2.26.0)
@@ -577,19 +563,6 @@ GEM
       multi_json (~> 1.0)
       rake
       rest-client (~> 1.6)
-    travis (1.6.11)
-      addressable (~> 2.3)
-      backports
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.9)
-      gh (~> 0.13)
-      highline (~> 1.6)
-      launchy (~> 2.1)
-      pry (~> 0.9)
-      pusher-client (~> 0.4)
-      typhoeus (~> 0.6, >= 0.6.8)
-    travis-lint (1.7.0)
-      hashr (~> 0.0.22)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -605,8 +578,6 @@ GEM
       json (~> 1.8)
       memoizable (~> 0.2.0)
       simple_oauth (~> 0.2.0)
-    typhoeus (0.6.8)
-      ethon (>= 0.7.0)
     tzinfo (0.3.39)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
@@ -623,7 +594,6 @@ GEM
     webmock (1.15.2)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket (1.1.4)
     xpath (0.1.4)
       nokogiri (~> 1.3)
     yard (0.8.7.3)
@@ -654,6 +624,7 @@ DEPENDENCIES
   ember-rails!
   fabrication (= 1.4.1)
   faker
+  faraday (~> 0.8.1)
   feedjira
   fog
   font_assets (~> 0.1.2)
@@ -693,7 +664,7 @@ DEPENDENCIES
   newrelic_resque_agent
   newrelic_rpm
   nokogiri
-  octokit
+  octokit (~> 1.23.0)
   oj
   omniauth (~> 1.1.0)
   omniauth-facebook
@@ -733,8 +704,6 @@ DEPENDENCIES
   syntax
   timecop
   tire (~> 0.4.1)
-  travis
-  travis-lint
   tweet-button
   twitter
   uglifier (>= 1.0.3)
