summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-04-17 12:32:31 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-04-18 17:02:40 -0300
commit5f39729c19fa22836686dab32fbcf7c34f32fd41 (patch)
tree7ac5e5f30b9a7c210d41dd917cb9b1d68376dc2e
parent387b025d15c3e0536d37128c282e02e9025dcd75 (diff)
downloadgitlab-ce-5f39729c19fa22836686dab32fbcf7c34f32fd41.tar.gz
Update octokit gem to version 4.3.0
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 199ef65d922..8caa749a8d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -315,7 +315,7 @@ end
gem "newrelic_rpm", '~> 3.14'
-gem 'octokit', '~> 3.8.0'
+gem 'octokit', '~> 4.3.0'
gem "mail_room", "~> 0.6.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index ad7d7c18559..958824f7ed9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -485,8 +485,8 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
- octokit (3.8.0)
- sawyer (~> 0.6.0, >= 0.5.3)
+ octokit (4.3.0)
+ sawyer (~> 0.7.0, >= 0.5.3)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
@@ -712,8 +712,8 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- sawyer (0.6.0)
- addressable (~> 2.3.5)
+ sawyer (0.7.0)
+ addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
scss_lint (0.47.1)
rake (>= 0.9, < 11)
@@ -968,7 +968,7 @@ DEPENDENCIES
newrelic_rpm (~> 3.14)
nokogiri (~> 1.6.7, >= 1.6.7.2)
oauth2 (~> 1.0.0)
- octokit (~> 3.8.0)
+ octokit (~> 4.3.0)
omniauth (~> 1.3.1)
omniauth-auth0 (~> 1.4.1)
omniauth-azure-oauth2 (~> 0.0.6)