summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-01-16 14:21:44 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-01-16 14:21:44 +0100
commit4657c28777dfc2729261f895f8e36cbef51395bc (patch)
tree86c2483e843be06ad10c0f0b43f6a20da3a5a6b8 /lib/api/entities.rb
parent5456859b5b28baca95ced74179a349563498a5f0 (diff)
parentdaaaf5ef9f182761ac07d76d24d971765134c7e1 (diff)
downloadgitlab-ce-fix/keep-artifacts-button-visibility.tar.gz
Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility
* master: (579 commits) Conflicts: spec/models/build_spec.rb
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index d2fadf6a3d0..885ce7d44bc 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -565,6 +565,8 @@ module API
expose :repository_storages
expose :koding_enabled
expose :koding_url
+ expose :plantuml_enabled
+ expose :plantuml_url
end
class Release < Grape::Entity