diff options
| author | David Turner <novalis@novalis.org> | 2017-06-16 14:39:21 -0400 |
|---|---|---|
| committer | David Turner <novalis@novalis.org> | 2017-06-19 13:33:15 -0400 |
| commit | 1cd1bab3af90b55119a16d3aceeb4f993ec31e5d (patch) | |
| tree | caa2d3e49f411848050c6c7d45ed4dff2425814a /lib | |
| parent | ad521bde1bb556709edd39d8a9aa67ee47605b91 (diff) | |
| download | gitlab-ce-1cd1bab3af90b55119a16d3aceeb4f993ec31e5d.tar.gz | |
add printing_merge_request_link_enabled to API
Diffstat (limited to 'lib')
| -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 412443a2405..69300198e42 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -115,6 +115,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, |