diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-14 17:00:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-14 17:00:25 +0000 |
| commit | 8b0e07f95b1d5554aa9e52312b3d1b9dc7003396 (patch) | |
| tree | 77725b82fd009efebd30d55540b9571545cc9157 /Gemfile.lock | |
| parent | 5cd13f3590cd88fe33dd06ae7531d553e7618c1d (diff) | |
| parent | 5e49ae801d1851d7b579ac4aa155ec36ddaacb85 (diff) | |
| download | gitlab-ce-8b0e07f95b1d5554aa9e52312b3d1b9dc7003396.tar.gz | |
Merge branch 'update-octokit' into 'master'
Update octokit 4.6.2 -> 4.8
See merge request gitlab-org/gitlab-ce!17738
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
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) |