summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-01-03 13:10:35 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2017-01-03 13:10:35 +0100
commit1b7ffb78d21b6237b7dfcc8ab18d7351d87e3f07 (patch)
treecf7681a315a3d655a817ec441c3f0308b2168a5d /Gemfile.lock
parent381a0bdcbba88d96a96b870894f7e0c182380632 (diff)
downloadgitlab-ce-1b7ffb78d21b6237b7dfcc8ab18d7351d87e3f07.tar.gz
Fix Gemfile.lock for the octokit updatefix-gemfile-lock-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.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
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)