summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-08-28 15:02:27 -0700
committerStan Hu <stanhu@gmail.com>2018-08-28 15:02:54 -0700
commit04845fdeae75ba5de7c93992a5d55663edf647e0 (patch)
tree345529d947f1347d08f527447c202897b8164b56 /lib/api/entities.rb
parent27580720e1c26e0508960152753d2230cebbe681 (diff)
parente19f2531366b0a897c738af1d1e3905b8b72ace4 (diff)
downloadgitlab-ce-04845fdeae75ba5de7c93992a5d55663edf647e0.tar.gz
Merge remote-tracking branch 'origin/master' into dev/master
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 }