diff --git a/Gemfile b/Gemfile
index f37a474d0..c23b1a7e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gem "rails",    "~>4.2.2"
 gem "resque"
 gem "resque-lock-timeout"
-gem "octokit"
+gem "octokit",  "~>4.18.0"
 gem "unicorn"
 gem "yajl-ruby"
 gem "posix-spawn"
diff --git a/Gemfile.lock b/Gemfile.lock
index fefa97ac9..c545f633f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     arel (6.0.0)
     ast (2.0.0)
     astrolabe (1.3.0)
@@ -69,7 +70,7 @@ GEM
     dotenv (0.9.0)
     dpl (1.5.7)
     erubis (2.7.0)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
@@ -105,7 +106,7 @@ GEM
     mono_logger (1.1.0)
     multi_json (1.11.0)
     multi_xml (0.5.5)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -115,8 +116,9 @@ GEM
       net-ssh (>= 2.6.5)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    octokit (3.4.0)
-      sawyer (~> 0.5.3)
+    octokit (4.18.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
     parser (2.2.2.5)
       ast (>= 1.1, < 3.0)
     pg (0.17.1)
@@ -126,6 +128,7 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    public_suffix (3.1.1)
     rack (1.6.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
@@ -196,9 +199,9 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.5.1)
     safe_yaml (1.0.4)
-    sawyer (0.5.5)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -256,7 +259,7 @@ DEPENDENCIES
   foreman
   hipchat
   meta_request
-  octokit
+  octokit (~> 4.18.0)
   pg
   posix-spawn
   pry
@@ -273,3 +276,6 @@ DEPENDENCIES
   warden-github-rails
   webmock
   yajl-ruby
+
+BUNDLED WITH
+   1.17.3
diff --git a/spec/controllers/concerns/webhook_validations_spec.rb b/spec/controllers/concerns/webhook_validations_spec.rb
index c9e45572e..d57978873 100644
--- a/spec/controllers/concerns/webhook_validations_spec.rb
+++ b/spec/controllers/concerns/webhook_validations_spec.rb
@@ -25,8 +25,8 @@ def request
 
   it "makes methods available" do
     klass = WebhookValidationsTester.new("192.30.252.41")
-    expect(klass).to be_valid_incoming_webhook_address
+    expect(klass.valid_incoming_webhook_address?).to be_true
     klass = WebhookValidationsTester.new("127.0.0.1")
-    expect(klass).to_not be_valid_incoming_webhook_address
+    expect(klass.valid_incoming_webhook_address?).to be_false
   end
 end
diff --git a/spec/models/concerns/api_client_spec.rb b/spec/models/concerns/api_client_spec.rb
index 32b9a25e8..b901d472b 100644
--- a/spec/models/concerns/api_client_spec.rb
+++ b/spec/models/concerns/api_client_spec.rb
@@ -22,7 +22,7 @@ class ApiClientTester
       ENV["GITHUB_CLIENT_ID"]     = "id"
       ENV["GITHUB_CLIENT_SECRET"] = "secret"
 
-      stub_request(:get, "https://api.github.com/meta?client_id=id&client_secret=secret")
+      stub_request(:get, "https://id:secret@api.github.com/meta")
         .with(:headers => octokit_request_headers)
         .to_return(:status => 200, :body => "ok")
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 796f2ccec..6b567ae9b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+require 'securerandom'
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= "test"
 ENV["RAILS_SECRET_KEY_BASE"] ||= SecureRandom.hex
diff --git a/spec/support/helpers/meta_helper.rb b/spec/support/helpers/meta_helper.rb
index de60bde03..904fad30d 100644
--- a/spec/support/helpers/meta_helper.rb
+++ b/spec/support/helpers/meta_helper.rb
@@ -8,7 +8,8 @@ def stub_meta
       }
     }
 
-    get_url = "https://api.github.com/meta?client_id=%3Cunknown-client-id%3E&client_secret=%3Cunknown-client-secret%3E"
+    basic_auth = "#{ENV['GITHUB_CLIENT_ID']}:#{ENV['GITHUB_CLIENT_SECRET']}@"
+    get_url = "https://#{basic_auth}api.github.com/meta"
 
     stub_request(:get, get_url).with(request_params)
       .to_return(:status => 200, :body => double("hooks" => ["192.30.252.0/22"]))
diff --git a/vendor/cache/addressable-2.3.6.gem b/vendor/cache/addressable-2.3.6.gem
deleted file mode 100644
index 254dec853..000000000
Binary files a/vendor/cache/addressable-2.3.6.gem and /dev/null differ
diff --git a/vendor/cache/addressable-2.8.0.gem b/vendor/cache/addressable-2.8.0.gem
new file mode 100644
index 000000000..1e41e1cd0
Binary files /dev/null and b/vendor/cache/addressable-2.8.0.gem differ
diff --git a/vendor/cache/faraday-0.9.0.gem b/vendor/cache/faraday-0.9.0.gem
deleted file mode 100644
index 0b00e52ff..000000000
Binary files a/vendor/cache/faraday-0.9.0.gem and /dev/null differ
diff --git a/vendor/cache/faraday-0.9.2.gem b/vendor/cache/faraday-0.9.2.gem
new file mode 100644
index 000000000..35a1675ee
Binary files /dev/null and b/vendor/cache/faraday-0.9.2.gem differ
diff --git a/vendor/cache/multipart-post-2.0.0.gem b/vendor/cache/multipart-post-2.0.0.gem
deleted file mode 100644
index abfff3d20..000000000
Binary files a/vendor/cache/multipart-post-2.0.0.gem and /dev/null differ
diff --git a/vendor/cache/multipart-post-2.1.1.gem b/vendor/cache/multipart-post-2.1.1.gem
new file mode 100644
index 000000000..027956d9a
Binary files /dev/null and b/vendor/cache/multipart-post-2.1.1.gem differ
diff --git a/vendor/cache/octokit-3.4.0.gem b/vendor/cache/octokit-3.4.0.gem
deleted file mode 100644
index c619e5072..000000000
Binary files a/vendor/cache/octokit-3.4.0.gem and /dev/null differ
diff --git a/vendor/cache/octokit-4.18.0.gem b/vendor/cache/octokit-4.18.0.gem
new file mode 100644
index 000000000..3f72a4479
Binary files /dev/null and b/vendor/cache/octokit-4.18.0.gem differ
diff --git a/vendor/cache/public_suffix-3.1.1.gem b/vendor/cache/public_suffix-3.1.1.gem
new file mode 100644
index 000000000..83c54eee1
Binary files /dev/null and b/vendor/cache/public_suffix-3.1.1.gem differ
diff --git a/vendor/cache/sawyer-0.5.5.gem b/vendor/cache/sawyer-0.5.5.gem
deleted file mode 100644
index ad493b3cc..000000000
Binary files a/vendor/cache/sawyer-0.5.5.gem and /dev/null differ
diff --git a/vendor/cache/sawyer-0.8.2.gem b/vendor/cache/sawyer-0.8.2.gem
new file mode 100644
index 000000000..f8b8f8a76
Binary files /dev/null and b/vendor/cache/sawyer-0.8.2.gem differ