summaryrefslogtreecommitdiff
path: root/Gemfile.rails5.lock
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-10-16 12:54:37 +0000
committerRémy Coutable <remy@rymai.me>2018-10-16 12:54:37 +0000
commit99127e6a15d9635f3d4946d520cc9c313ada1ce1 (patch)
tree38b2038ed12421c4f9ee894ad0c02e5464b8dd6b /Gemfile.rails5.lock
parente11ff3b6bc3700b93f4893903ff29c8914c70464 (diff)
parent6d57cf9dd27495de966c251b3c0f736c9bb4d526 (diff)
downloadgitlab-ce-99127e6a15d9635f3d4946d520cc9c313ada1ce1.tar.gz
Merge branch 'grpc-update-1-15' into 'master'
Use grpc v1.15.x See merge request gitlab-org/gitlab-ce!22350
Diffstat (limited to 'Gemfile.rails5.lock')
-rw-r--r--Gemfile.rails5.lock20
1 files changed, 7 insertions, 13 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 8aebf78924f..36bbf403f01 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -326,15 +326,14 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google-protobuf (3.5.1)
- googleapis-common-protos-types (1.0.1)
+ googleapis-common-protos-types (1.0.2)
google-protobuf (~> 3.0)
- googleauth (0.6.2)
+ googleauth (0.6.6)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
- logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
- os (~> 0.9)
+ os (>= 0.9, < 2.0)
signet (~> 0.7)
gpgme (2.0.13)
mini_portile2 (~> 2.1)
@@ -358,10 +357,9 @@ GEM
railties
sprockets-rails
graphql (1.8.1)
- grpc (1.11.0)
+ grpc (1.15.0)
google-protobuf (~> 3.1)
googleapis-common-protos-types (~> 1.0.0)
- googleauth (>= 0.5.1, < 0.7)
haml (5.0.4)
temple (>= 0.8.0)
tilt
@@ -463,11 +461,7 @@ GEM
xml-simple
licensee (8.9.2)
rugged (~> 0.24)
- little-plugger (1.1.4)
locale (2.1.2)
- logging (2.2.2)
- little-plugger (~> 1.1)
- multi_json (~> 1.10)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
@@ -574,7 +568,7 @@ GEM
org-ruby (0.9.12)
rubypants (~> 0.2)
orm_adapter (0.5.0)
- os (0.9.6)
+ os (1.0.0)
parallel (1.12.1)
parser (2.5.1.0)
ast (~> 2.4.0)
@@ -846,7 +840,7 @@ GEM
sidekiq-cron (0.6.0)
rufus-scheduler (>= 3.3.0)
sidekiq (>= 4.2.1)
- signet (0.8.1)
+ signet (0.11.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
@@ -1050,7 +1044,7 @@ DEPENDENCIES
grape_logging (~> 1.7)
graphiql-rails (~> 1.4.10)
graphql (~> 1.8.0)
- grpc (~> 1.11.0)
+ grpc (~> 1.15.0)
haml_lint (~> 0.26.0)
hamlit (~> 2.8.8)
hangouts-chat (~> 0.0.5)