diff options
| author | Jan <king-jan1999@hotmail.de> | 2018-04-04 09:56:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-04 09:56:38 +0000 |
| commit | f6d58310fc3d85a26b5829c507d932b1ca675db2 (patch) | |
| tree | 4dfebd416396e621c6f08707cd1bfc2673d89a0b /lib/api | |
| parent | c7e0fc769231e0c027b63e6997347fe7da6b73e6 (diff) | |
| download | gitlab-ce-f6d58310fc3d85a26b5829c507d932b1ca675db2.tar.gz | |
Resolve "Allow the configuration of a project's merge method via the API"
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 b7a390696c7..e5ecd37e473 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -206,6 +206,7 @@ module API expose :request_access_enabled expose :only_allow_merge_if_all_discussions_are_resolved expose :printing_merge_request_link_enabled + expose :merge_method expose :statistics, using: 'API::Entities::ProjectStatistics', if: :statistics diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 467bc78dad8..3d5b3c5a535 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -28,6 +28,7 @@ module API 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' + optional :merge_method, type: String, values: %w(ff rebase_merge merge), desc: 'The merge method used when merging merge requests' end params :optional_params do @@ -274,6 +275,7 @@ module API :issues_enabled, :lfs_enabled, :merge_requests_enabled, + :merge_method, :name, :only_allow_merge_if_all_discussions_are_resolved, :only_allow_merge_if_pipeline_succeeds, |