diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-26 14:41:04 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-10-28 14:30:41 +0300 |
| commit | dc60649685b7e02b54bd49c4af6d25b18e8abc02 (patch) | |
| tree | 0ab9ab2d208b0f951f7d613dbd8b963e1f168929 /lib/gitlab/git | |
| parent | 80a9905414d04e478e6b4154a51ffaa8232ca5b0 (diff) | |
Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'
Add path attribute to WikiFile class
Closes #39420
See merge request gitlab-org/gitlab-ce!15019
(cherry picked from commit 98c57e9a9f73409a912189064a7adf0431768b3a)
76becfb5 Add path attribute to WikiFile class
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/wiki_file.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/git/wiki_file.rb b/lib/gitlab/git/wiki_file.rb index 527f2a44dea..84335aca4bc 100644 --- a/lib/gitlab/git/wiki_file.rb +++ b/lib/gitlab/git/wiki_file.rb @@ -1,7 +1,7 @@ module Gitlab module Git class WikiFile - attr_reader :mime_type, :raw_data, :name + attr_reader :mime_type, :raw_data, :name, :path # This class is meant to be serializable so that it can be constructed # by Gitaly and sent over the network to GitLab. @@ -13,6 +13,7 @@ module Gitlab @mime_type = gollum_file.mime_type @raw_data = gollum_file.raw_data @name = gollum_file.name + @path = gollum_file.path end end end |