diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-03 12:11:56 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-03 12:11:56 -0500 |
| commit | f682cc189a38e6cbe6ee92a3327d6b865c42e84a (patch) | |
| tree | 212dcf7c84a96615040ce81d51cad01e6e9454d0 /Gemfile.lock | |
| parent | 62364576bc4e2b141752a6ea9068171fa619a6ff (diff) | |
| parent | 18fee3060c78e032777b5dc6b3d1f60432446ea5 (diff) | |
| download | gitlab-ce-f682cc189a38e6cbe6ee92a3327d6b865c42e84a.tar.gz | |
Merge branch '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 72ce0c555a0..b7b80061e3f 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.38.0) + gitaly-proto (0.39.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.38.0) + gitaly-proto (~> 0.39.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |