summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-26 11:41:04 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-26 11:41:04 +0000
commit98c57e9a9f73409a912189064a7adf0431768b3a (patch)
tree0792923507145899c3865e42d1c62c9072bfaeed /lib
parent7ece18f1418a776b215a9b2a7013c4e227c31f6a (diff)
parent76becfb5b4cf9030f4098e7eab435c8e42dd8a45 (diff)
downloadgitlab-ce-98c57e9a9f73409a912189064a7adf0431768b3a.tar.gz
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
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/wiki_file.rb3
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