diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-30 15:43:45 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-30 15:43:45 +0000 |
| commit | 7c36e8561c60882e6b0b47c563f7d19f3d6b02a6 (patch) | |
| tree | 2c833fc39f5a86717ddedf1e5e47cf247daf0f9a /lib | |
| parent | 4e8bde967e9beb2d2749bd9d2358adeb895ae2dc (diff) | |
| parent | b5987e62ea609b2bb55ab762d074a1fd2642d325 (diff) | |
| download | gitlab-ce-7c36e8561c60882e6b0b47c563f7d19f3d6b02a6.tar.gz | |
Merge branch '41967_issue_api_closed_by_info' into 'master'
Add closed by information to issue API
See merge request gitlab-org/gitlab-ce!17042
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 38161d1f127..b7a390696c7 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -405,6 +405,7 @@ module API class IssueBasic < ProjectEntity expose :closed_at + expose :closed_by, using: Entities::UserBasic expose :labels do |issue, options| # Avoids an N+1 query since labels are preloaded issue.labels.map(&:title).sort diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 791a54e1b69..598832fb2df 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -19,7 +19,7 @@ module Gitlab custom_attributes: 'ProjectCustomAttribute', project_badges: 'Badge' }.freeze - USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id last_edited_by_id merge_user_id resolved_by_id].freeze + USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id last_edited_by_id merge_user_id resolved_by_id closed_by_id].freeze PROJECT_REFERENCES = %w[project_id source_project_id target_project_id].freeze |