diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-05-30 16:19:36 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-05-30 16:19:36 +0300 |
| commit | 22866a28a5f27b2a41be99799aaa85fa4098fba1 (patch) | |
| tree | c9c15eb8ed43d5f35e5030ea93995d1a1fdb4073 /app/serializers | |
| parent | 112bd85393389c317bd5364360a61082f3e9558b (diff) | |
| parent | 99ac06dfa04aee91118a00e1cc2fa733be80bdd1 (diff) | |
| download | gitlab-ce-22866a28a5f27b2a41be99799aaa85fa4098fba1.tar.gz | |
Merge remote-tracking branch 'origin/master' into 46487-add-support-for-jupyter-in-gitlab-via-kubernetes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/group_child_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/group_child_entity.rb b/app/serializers/group_child_entity.rb index 15ec0f89bb2..ee150eefd9e 100644 --- a/app/serializers/group_child_entity.rb +++ b/app/serializers/group_child_entity.rb @@ -31,7 +31,7 @@ class GroupChildEntity < Grape::Entity end # Project only attributes - expose :star_count, + expose :star_count, :archived, if: lambda { |_instance, _options| project? } # Group only attributes |