diff options
author | Rémy Coutable <remy@rymai.me> | 2017-06-21 09:00:57 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-06-21 09:00:57 +0000 |
commit | 18ef5be6c4f41d671398bf754dec84ba9a897609 (patch) | |
tree | 24c58a42b56399152a6f767a1a8d5bf2406d4d2f /lib/api/entities.rb | |
parent | 21465deef009f281c3619730e9c402d515c8f78d (diff) | |
parent | 1cd1bab3af90b55119a16d3aceeb4f993ec31e5d (diff) | |
download | gitlab-ce-18ef5be6c4f41d671398bf754dec84ba9a897609.tar.gz |
Merge branch 'dt/printing-to-api' into 'master'
add printing_merge_request_link_enabled to API
See merge request !12240
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 8bce79529e6..675bc52a983 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -118,6 +118,7 @@ module API expose :only_allow_merge_if_pipeline_succeeds expose :request_access_enabled expose :only_allow_merge_if_all_discussions_are_resolved + expose :printing_merge_request_link_enabled expose :statistics, using: 'API::Entities::ProjectStatistics', if: :statistics end |