diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-05 15:06:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-05 15:06:15 +0000 |
| commit | edab9360009c6ca30e04c2ad3c2fd68f3aa5c55f (patch) | |
| tree | 9efee3a24520ea5285cb8ceaf92b0f869ed6c6a6 /lib/api/entities.rb | |
| parent | c503429e5e8538649bec02d74963ec0eb8f0cb98 (diff) | |
| parent | 6ced2f124355ac08b111b4c2ac60ae57e3851ba4 (diff) | |
| download | gitlab-ce-edab9360009c6ca30e04c2ad3c2fd68f3aa5c55f.tar.gz | |
Merge branch 'master' into 'rd-44364-deprecate-support-for-dsa-keys'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index c4537036a3a..c76d3ff45d0 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -559,7 +559,9 @@ module API expose :discussion_locked expose :should_remove_source_branch?, as: :should_remove_source_branch expose :force_remove_source_branch?, as: :force_remove_source_branch - expose :allow_maintainer_to_push, if: -> (merge_request, _) { merge_request.for_fork? } + expose :allow_collaboration, if: -> (merge_request, _) { merge_request.for_fork? } + # Deprecated + expose :allow_collaboration, as: :allow_maintainer_to_push, if: -> (merge_request, _) { merge_request.for_fork? } expose :web_url do |merge_request, options| Gitlab::UrlBuilder.build(merge_request) |