From f61121225ebaf9dc425d0e2ad550cf368add8f6e Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Wed, 11 Apr 2018 16:08:23 +0200 Subject: [PATCH] Fix finding wiki file when Gitaly is enabled Fixes gitaly#1126 --- .../unreleased/fix-wiki-find-file-gitaly.yml | 5 +++++ lib/gitlab/gitaly_client/wiki_service.rb | 2 +- spec/fixtures/big-image.png | Bin 0 -> 324444 bytes spec/models/project_wiki_spec.rb | 12 ++++++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/fix-wiki-find-file-gitaly.yml create mode 100644 spec/fixtures/big-image.png diff --git a/changelogs/unreleased/fix-wiki-find-file-gitaly.yml b/changelogs/unreleased/fix-wiki-find-file-gitaly.yml new file mode 100644 index 00000000000..5c536be7ae5 --- /dev/null +++ b/changelogs/unreleased/fix-wiki-find-file-gitaly.yml @@ -0,0 +1,5 @@ +--- +title: Fix finding wiki file when Gitaly is enabled +merge_request: +author: +type: fixed 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 diff --git a/spec/fixtures/big-image.png b/spec/fixtures/big-image.png new file mode 100644 index 0000000000000000000000000000000000000000..a333363ac36377ac72fc13bf88a732a6ea482355 GIT binary patch literal 324444 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