summaryrefslogtreecommitdiff
path: root/app/graphql/types/tree/tree_type.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-05 15:44:53 +0000
committerNick Thomas <nick@gitlab.com>2019-06-05 15:44:53 +0000
commit327c7d5a07fa08276a52b6a2bfdf79eee812a2cd (patch)
tree0da14d9a65451f5c1937fb8679cab3ab9f4c7954 /app/graphql/types/tree/tree_type.rb
parent86ff32da666c8d284ecff5987d42fa4dfed2ee9b (diff)
parent4644a2daf5ec5e86e2b2989f04e99e4f081f6fef (diff)
downloadgitlab-ce-327c7d5a07fa08276a52b6a2bfdf79eee812a2cd.tar.gz
Merge branch 'graphql-file-entry-url' into 'master'
Add web_url to tree entry in GraphQL API See merge request gitlab-org/gitlab-ce!28646
Diffstat (limited to 'app/graphql/types/tree/tree_type.rb')
-rw-r--r--app/graphql/types/tree/tree_type.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/graphql/types/tree/tree_type.rb b/app/graphql/types/tree/tree_type.rb
index 1eb6c43972e..1ee93ed9542 100644
--- a/app/graphql/types/tree/tree_type.rb
+++ b/app/graphql/types/tree/tree_type.rb
@@ -4,9 +4,15 @@ module Types
class TreeType < BaseObject
graphql_name 'Tree'
- field :trees, Types::Tree::TreeEntryType.connection_type, null: false
+ field :trees, Types::Tree::TreeEntryType.connection_type, null: false, resolve: -> (obj, args, ctx) do
+ Gitlab::Graphql::Representation::TreeEntry.decorate(obj.trees, obj.repository)
+ end
+
field :submodules, Types::Tree::SubmoduleType.connection_type, null: false
- field :blobs, Types::Tree::BlobType.connection_type, null: false
+
+ field :blobs, Types::Tree::BlobType.connection_type, null: false, resolve: -> (obj, args, ctx) do
+ Gitlab::Graphql::Representation::TreeEntry.decorate(obj.blobs, obj.repository)
+ end
end
end
end