diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-29 21:10:24 +0300 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-29 21:10:24 +0300 |
| commit | bd2822ce1f67c5e50ead272962840638fe37a1f7 (patch) | |
| tree | 2b38d2d4943b1b70eb0bce66dc40a562accfc363 /Gemfile.lock | |
| parent | b452b0c7056e481778bfc5838d47dca813bf12ed (diff) | |
| parent | a7976905d17c22b0f2caeb54fa7f468568412cd1 (diff) | |
Merge remote-tracking branch 'origin/master' into sh-headless-chrome-support
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 be739707d94..72ce0c555a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -276,7 +276,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.33.0) + gitaly-proto (0.38.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1021,7 +1021,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.33.0) + gitaly-proto (~> 0.38.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |