summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <manuel@rueg.eu>2016-12-18 05:15:31 +0100
committerManuel Rüger <manuel@rueg.eu>2016-12-30 01:16:11 +0100
commit10b8b00e453ff8e2d36d112917da0402931856d8 (patch)
treeb4b4ac07da660da9015e015bbf2fc35c36861e48
parentf9a49d0999de0cd81accd08abc2248f9c0fa56c9 (diff)
downloadgitlab-ce-10b8b00e453ff8e2d36d112917da0402931856d8.tar.gz
Update octokit to 4.6.2
ChangeLog: https://github.com/octokit/octokit.rb/releases
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index eadb67405ee..0b59cca5b84 100644
--- a/Gemfile
+++ b/Gemfile
@@ -328,7 +328,7 @@ end
gem 'newrelic_rpm', '~> 3.16'
-gem 'octokit', '~> 4.3.0'
+gem 'octokit', '~> 4.6.2'
gem 'mail_room', '~> 0.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c192d2fc6e..d4ca5ffeadf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -421,7 +421,7 @@ GEM
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
octokit (4.3.0)
- sawyer (~> 0.7.0, >= 0.5.3)
+ sawyer (~> 0.8.0, >= 0.5.3)
oj (2.17.4)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
@@ -650,8 +650,8 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- sawyer (0.7.0)
- addressable (>= 2.3.5, < 2.5)
+ sawyer (0.8.1)
+ addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 0.10)
scss_lint (0.47.1)
rake (>= 0.9, < 11)