diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-30 20:47:23 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-30 20:47:23 +0000 |
| commit | 95b4f7ea37d641c7c30e9903dd3390a7d04a6e67 (patch) | |
| tree | 9abac8cc851f8249a0b0279f1406d8f6fe9cdaad /Gemfile.lock | |
| parent | a20e02a5bc2e52f679ee220f61abeb9ecfff1ec9 (diff) | |
| parent | fa9d47f221fff4d75e3c50670aeeac7a3d675f7a (diff) | |
| download | gitlab-ce-95b4f7ea37d641c7c30e9903dd3390a7d04a6e67.tar.gz | |
Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'
Migrate fetching wiki page formatted content to Gitaly
Closes gitaly#958
See merge request gitlab-org/gitlab-ce!16716
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 ca032a4b2cc..a8531f8e436 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,7 +285,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.78.0) + gitaly-proto (0.82.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -1056,7 +1056,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.78.0) + gitaly-proto (~> 0.82.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |