diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-04 11:52:22 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-04 11:52:22 +0300 |
| commit | 70b92fb380659717e2f3a4f5aac802ec5460e78c (patch) | |
| tree | f7e8132f13cdcb25b098924e92eff5d53022483d /app/serializers | |
| parent | 200ebab1cf8a41585c94a15bcc37547abd73bc80 (diff) | |
| parent | 863ee930a6260c42d3d0252a0310ac9adff24862 (diff) | |
Merge branch '19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master'
Forms with task lists can be overwritten when editing simultaneously
See merge request gitlab-org/gitlab-ce!23938
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_basic_entity.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/merge_request_basic_entity.rb b/app/serializers/merge_request_basic_entity.rb index 084627f9dbe..178e72f4f0a 100644 --- a/app/serializers/merge_request_basic_entity.rb +++ b/app/serializers/merge_request_basic_entity.rb @@ -11,4 +11,5 @@ class MergeRequestBasicEntity < Grape::Entity expose :labels, using: LabelEntity expose :assignee, using: API::Entities::UserBasic expose :task_status, :task_status_short + expose :lock_version, :lock_version end |