Skip to content
Snippets Groups Projects
Verified Commit 1b7ffb78 authored by Yorick Peterse's avatar Yorick Peterse
Browse files

Fix Gemfile.lock for the octokit update

MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8158 updated
the octokit Gem but did not include all the changes for Gemfile.lock.
parent 381a0bdc
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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)
Loading
Loading
@@ -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)
Loading
Loading
@@ -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)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment