diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-04-11 22:19:29 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-04-11 22:19:29 +0300 |
| commit | 947ed8b88281a618530ae30bc0fe1e3d61a3c1d9 (patch) | |
| tree | 33efbf5e22ba9afe623d0e2fa4347282e31b7196 /lib | |
| parent | 84c70f4335e1b4f496f29cb99cc7fdaf926a5571 (diff) | |
| parent | f61121225ebaf9dc425d0e2ad550cf368add8f6e (diff) | |
Merge branch 'fix/wiki-find-file-gitaly' into 'master'
Fix finding wiki file when Gitaly is enabled
Closes gitaly#1126
See merge request gitlab-org/gitlab-ce!18317
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client/wiki_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/wiki_service.rb b/lib/gitlab/gitaly_client/wiki_service.rb index 0d8dd5cb8f4..7a698e4b3f3 100644 --- a/lib/gitlab/gitaly_client/wiki_service.rb +++ b/lib/gitlab/gitaly_client/wiki_service.rb @@ -136,7 +136,7 @@ module Gitlab wiki_file = nil response.each do |message| - next unless message.name.present? + next unless message.name.present? || wiki_file if wiki_file wiki_file.raw_data << message.raw_data |