diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2019-08-19 11:34:19 +0300 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-20 15:15:18 -0500 |
| commit | 96b994bd05db072655bcd28204770013feeaa779 (patch) | |
| tree | f9f04e87edb494e4ea215073c13b56f7f95af2ee | |
| parent | 4e3c7a0bab0dc42cb46dd06059820eea538adfc9 (diff) | |
| download | gitlab-ce-96b994bd05db072655bcd28204770013feeaa779.tar.gz | |
Fix comments related to BE part
- Edit commit messge body to fix "danger-review"
| -rw-r--r-- | app/serializers/merge_request_sidebar_basic_entity.rb | 7 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_sidebar.json | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/serializers/merge_request_sidebar_basic_entity.rb b/app/serializers/merge_request_sidebar_basic_entity.rb index fdd0cdc50d2..3c911bbe4c8 100644 --- a/app/serializers/merge_request_sidebar_basic_entity.rb +++ b/app/serializers/merge_request_sidebar_basic_entity.rb @@ -1,6 +1,9 @@ # frozen_string_literal: true class MergeRequestSidebarBasicEntity < IssuableSidebarBasicEntity + expose :current_user, if: lambda { |_issuable| current_user } do + expose :can_merge do |merge_request| + merge_request.can_be_merged_by?(current_user) + end + end end - -MergeRequestSidebarBasicEntity.prepend_if_ee('EE::MergeRequestSidebarBasicEntity') diff --git a/spec/fixtures/api/schemas/entities/merge_request_sidebar.json b/spec/fixtures/api/schemas/entities/merge_request_sidebar.json index 214b67a9a0f..9945de8a856 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_sidebar.json +++ b/spec/fixtures/api/schemas/entities/merge_request_sidebar.json @@ -2,6 +2,7 @@ "type": "object", "properties" : { "id": { "type": "integer" }, + "iid": { "type": "integer" }, "type": { "type": "string" }, "author_id": { "type": "integer" }, "project_id": { "type": "integer" }, |