Merge branch 'update-octokit' into 'master'

Update octokit 4.6.2 -> 4.8

See merge request gitlab-org/gitlab-ce!17738

2 files changed, 3 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index 73b32e5acd7..fda6e71043c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -381,7 +381,7 @@ group :test do
   gem 'test-prof', '~> 0.2.5'
 end
 
-gem 'octokit', '~> 4.6.2'
+gem 'octokit', '~> 4.8'
 
 gem 'mail_room', '~> 0.9.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7ad5e88859b..2baa84960c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -524,7 +524,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.6.2)
+    octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     oj (2.17.5)
     omniauth (1.4.2)
@@ -1109,7 +1109,7 @@ DEPENDENCIES
   net-ssh (~> 4.1.0)
   nokogiri (~> 1.8.2)
   oauth2 (~> 1.4)
-  octokit (~> 4.6.2)
+  octokit (~> 4.8)
   oj (~> 2.17.4)
   omniauth (~> 1.4.2)
   omniauth-auth0 (~> 1.4.1)