Commit b35cfbdd authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'update-octokit' into 'master'

Update octokit 4.6.2 -> 4.8

See merge request gitlab-org/gitlab-ce!17738
......@@ -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'
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment