diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-01-03 13:33:12 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-01-03 13:33:12 +0000 |
| commit | 10960d6e811dd1ac20b5019648d955fec97ee2e6 (patch) | |
| tree | 635802d496d77c5e7aada7fe2cccfa1203d3b812 | |
| parent | c67e9bb353dee34a86e072436e13a97e18bf6925 (diff) | |
| parent | 1b7ffb78d21b6237b7dfcc8ab18d7351d87e3f07 (diff) | |
| download | gitlab-ce-10960d6e811dd1ac20b5019648d955fec97ee2e6.tar.gz | |
Merge branch 'fix-gemfile-lock-update' into 'master'
Fix Gemfile.lock for the octokit update
See merge request !8414
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d4ca5ffeadf..5dcf3744d99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -420,7 +420,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.3.0) + octokit (4.6.2) sawyer (~> 0.8.0, >= 0.5.3) oj (2.17.4) omniauth (1.3.1) @@ -652,7 +652,7 @@ GEM tilt (>= 1.1, < 3) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 0.10) + faraday (~> 0.8, < 1.0) scss_lint (0.47.1) rake (>= 0.9, < 11) sass (~> 3.4.15) @@ -895,7 +895,7 @@ DEPENDENCIES newrelic_rpm (~> 3.16) nokogiri (~> 1.6.7, >= 1.6.7.2) oauth2 (~> 1.2.0) - octokit (~> 4.3.0) + octokit (~> 4.6.2) oj (~> 2.17.4) omniauth (~> 1.3.1) omniauth-auth0 (~> 1.4.1) |