diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-06 21:29:03 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-06 21:29:03 +0900 |
| commit | 91e530df246c6898f4e92e8cb61dde6f52304999 (patch) | |
| tree | 5015b0340530696a5a48e2d8cce943749f3e129c /app/serializers | |
| parent | f293288589f24e1928b57dcd3428b762ae9ced79 (diff) | |
| parent | 9560d5b8399df42109e5768f19a99d0d5a664bd9 (diff) | |
| download | gitlab-ce-91e530df246c6898f4e92e8cb61dde6f52304999.tar.gz | |
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index 36537c5bd02..297a459e394 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -42,6 +42,7 @@ class MergeRequestEntity < IssuableEntity expose :commits_count expose :cannot_be_merged?, as: :has_conflicts expose :can_be_merged?, as: :can_be_merged + expose :mergeable?, as: :mergeable expose :remove_source_branch?, as: :remove_source_branch expose :project_archived do |merge_request| |