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 | |
| 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')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -406,7 +406,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.78.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.82.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false |