diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-05 15:04:18 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-05 15:04:18 +0000 |
| commit | 6ced2f124355ac08b111b4c2ac60ae57e3851ba4 (patch) | |
| tree | 53f92c7f7766f9c0384ea507d812ce5e7d421b99 /app/serializers | |
| parent | cb77087246929cc92f6bd7ce2cb306855b6e6219 (diff) | |
| parent | 0d44f4d50ef175997fe1f90de9e622a4f3b867e3 (diff) | |
| download | gitlab-ce-6ced2f124355ac08b111b4c2ac60ae57e3851ba4.tar.gz | |
Merge branch '42751-rename-mr-maintainer-push' into 'master'
Rephrase Merge Request Maintainer Edit
See merge request gitlab-org/gitlab-ce!19061
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_widget_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb index 141070aef45..8260c6c7b84 100644 --- a/app/serializers/merge_request_widget_entity.rb +++ b/app/serializers/merge_request_widget_entity.rb @@ -13,7 +13,7 @@ class MergeRequestWidgetEntity < IssuableEntity expose :squash expose :target_branch expose :target_project_id - expose :allow_maintainer_to_push + expose :allow_collaboration expose :should_be_rebased?, as: :should_be_rebased expose :ff_only_enabled do |merge_request| |