diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-03 11:01:10 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-03 11:01:10 +0000 |
| commit | 1a8289e0ebe72831ae9f8f2dbb34cdabcdfc7c25 (patch) | |
| tree | c224cb87b9a818a469e6f3355f7ac199639f6fab | |
| parent | de25604fbca2f7005754d821d571bbcb1cc510ac (diff) | |
| parent | 10b8b00e453ff8e2d36d112917da0402931856d8 (diff) | |
| download | gitlab-ce-1a8289e0ebe72831ae9f8f2dbb34cdabcdfc7c25.tar.gz | |
Merge branch 'octokit' into 'master'
Update octokit to 4.6.2
See merge request !8158
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -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) |