diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-27 17:20:21 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-27 17:20:21 +0000 |
| commit | 5e48c1b851010a2af7ae922b1fb8588559c26e1e (patch) | |
| tree | 762bf91fd2488e687fd8296215afea7912c5fa42 /Gemfile.lock | |
| parent | 1226d166753e3c5acc5783ec767e2f83ee493b95 (diff) | |
| parent | 8e14cb4b5ad1906b4f7337c85d9459581965c274 (diff) | |
| download | gitlab-ce-5e48c1b851010a2af7ae922b1fb8588559c26e1e.tar.gz | |
Merge branch 'rs-bump-octokit' into 'master'
Bump octokit to `~> 3.8.0`
Closes #2877
See merge request !2536
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 87895c55886..d2c4ddfba56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -492,7 +492,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (~> 1.2) - octokit (3.7.1) + octokit (3.8.0) sawyer (~> 0.6.0, >= 0.5.3) omniauth (1.2.2) hashie (>= 1.2, < 4) @@ -965,7 +965,7 @@ DEPENDENCIES nokogiri (= 1.6.7.2) nprogress-rails (~> 0.1.6.7) oauth2 (~> 1.0.0) - octokit (~> 3.7.0) + octokit (~> 3.8.0) omniauth (~> 1.2.2) omniauth-azure-oauth2 (~> 0.0.6) omniauth-bitbucket (~> 0.0.2) |