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/entities.rb | |
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/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 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 |