summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-08-29 22:54:12 -0700
committerStan Hu <stanhu@gmail.com>2018-08-29 22:54:12 -0700
commit69eddc14b11b63429b8f2511a1127616c692b94c (patch)
treea94482be144cef60a8ee1b590857ca24f49f418a /lib/api/entities.rb
parentbc7a4eedf9fa6681465b622af52c34d49ffb5d0e (diff)
parentf981d4febbbb5103262f4daa858236d9c4ed9d67 (diff)
downloadgitlab-ce-69eddc14b11b63429b8f2511a1127616c692b94c.tar.gz
Merge branch 'master' into sh-test-ldap-clones-via-gitlab-qa
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 06262f0f991..95b25d7351a 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -429,6 +429,11 @@ module API
expose :merge_access_levels, using: Entities::ProtectedRefAccess
end
+ class ProtectedTag < Grape::Entity
+ expose :name
+ expose :create_access_levels, using: Entities::ProtectedRefAccess
+ end
+
class Milestone < Grape::Entity
expose :id, :iid
expose :project_id, if: -> (entity, options) { entity&.project_id }