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 | |
| 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')
| -rw-r--r-- | lib/api/entities.rb | 1 | ||||
| -rw-r--r-- | lib/api/projects.rb | 2 |
2 files changed, 3 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 diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 50d34e8a738..c5df45b7902 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -23,6 +23,7 @@ module API optional :only_allow_merge_if_all_discussions_are_resolved, type: Boolean, desc: 'Only allow to merge if all discussions are resolved' optional :tag_list, type: Array[String], desc: 'The list of tags for a project' optional :avatar, type: File, desc: 'Avatar image for project' + optional :printing_merge_request_link_enabled, type: Boolean, desc: 'Show link to create/view merge request when pushing from the command line' end params :optional_params do @@ -218,6 +219,7 @@ module API :only_allow_merge_if_all_discussions_are_resolved, :only_allow_merge_if_pipeline_succeeds, :path, + :printing_merge_request_link_enabled, :public_builds, :request_access_enabled, :shared_runners_enabled, |