Merge branch 'issue_11239' into 'master'

Expose epics closed_at on API

See merge request gitlab-org/gitlab!17156

doc/api/epics.md

@@ -88,6 +88,7 @@ Example response:
   "due_date_from_milestones": "2018-07-31",
   "created_at": "2018-07-17T13:36:22.770Z",
   "updated_at": "2018-07-18T12:22:05.239Z",
+  "closed_at": "2018-08-18T12:22:05.239Z",
   "labels": [],
   "upvotes": 4,
   "downvotes": 0
@@ -143,6 +144,7 @@ Example response:
   "due_date_from_milestones": "2018-07-31",
   "created_at": "2018-07-17T13:36:22.770Z",
   "updated_at": "2018-07-18T12:22:05.239Z",
+  "closed_at": "2018-08-18T12:22:05.239Z",
   "labels": [],
   "upvotes": 4,
   "downvotes": 0
@@ -209,6 +211,7 @@ Example response:
   "due_date_from_milestones": "2018-07-31",
   "created_at": "2018-07-17T13:36:22.770Z",
   "updated_at": "2018-07-18T12:22:05.239Z",
+  "closed_at": "2018-08-18T12:22:05.239Z",
   "labels": [],
   "upvotes": 4,
   "downvotes": 0
@@ -276,6 +279,7 @@ Example response:
   "due_date_from_milestones": "2018-07-31",
   "created_at": "2018-07-17T13:36:22.770Z",
   "updated_at": "2018-07-18T12:22:05.239Z",
+  "closed_at": "2018-08-18T12:22:05.239Z",
   "labels": [],
   "upvotes": 4,
   "downvotes": 0
@@ -358,7 +362,8 @@ Example response:
     "start_date": null,
     "end_date": null,
     "created_at": "2018-01-21T06:21:13.165Z",
-    "updated_at": "2018-01-22T12:41:41.166Z"
+    "updated_at": "2018-01-22T12:41:41.166Z",
+    "closed_at": "2018-08-18T12:22:05.239Z"
   },
   "target_url": "https://gitlab.example.com/groups/epics/5",
   "body": "Vel voluptas atque dicta mollitia adipisci qui at.",

ee/changelogs/unreleased/issue_11239.yml

+---
+title: Expose epics closed_at on API
+merge_request: 17156
+author:
+type: changed

ee/lib/ee/api/entities.rb

@@ -301,6 +301,7 @@ module EE
         end
         expose :created_at
         expose :updated_at
+        expose :closed_at
         expose :labels do |epic|
           # Avoids an N+1 query since labels are preloaded
           epic.labels.map(&:title).sort

ee/spec/fixtures/api/schemas/public_api/v4/epic.json

@@ -39,6 +39,7 @@
     "state": { "type": "string" },
     "created_at": { "type": ["string", "null"] },
     "updated_at": { "type": ["string", "null"] },
+    "closed_at": { "type": ["string", "null"] },
     "web_edit_url": { "type":  "string" },
     "web_url": { "type":  "string" },
     "reference": { "type":  "string" }

ee/spec/requests/api/epics_spec.rb

@@ -422,6 +422,15 @@ describe API::Epics do
         expect(response).to match_response_schema('public_api/v4/epic', dir: 'ee')
       end
 
+      it 'exposes closed_at attribute' do
+        epic.close
+
+        get api(url)
+
+        expect(response).to match_response_schema('public_api/v4/epic', dir: 'ee')
+        expect(json_response['closed_at']).to be_present
+      end
+
       it_behaves_like 'can admin epics'
     end
   end