fix merge

d3e78972 · Valery Sizov · 270bc4bd · d3e78972
Commit d3e78972 authored Feb 23, 2016 by Valery Sizov
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

lib/api/entities.rb lib/api/entities.rb +5 -0

No files found.
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -49,6 +49,11 @@ module API
      expose :enable_ssl_verification
    end

+    class ProjectGitHook < Grape::Entity
+      expose :id, :project_id, :created_at
+      expose :commit_message_regex, :deny_delete_tag
+    end
+
    class BasicProjectDetails < Grape::Entity
      expose :id
      expose :name, :name_with_namespace