summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-01-18 23:05:28 +0000
committerRobert Speicher <robert@gitlab.com>2018-01-18 23:05:28 +0000
commitdef2f1299512ce43370aa5b727a3d7f4733adf96 (patch)
treeefa7c5b8090a3b7adbeb94834436232d251a3bf9 /app/controllers
parent561374ac12ba53acb30ee8caa1b9ff1c2e00ead6 (diff)
parent4b6b8eccedb49014d4cd329a336015fb8d7bcff9 (diff)
downloadgitlab-ce-def2f1299512ce43370aa5b727a3d7f4733adf96.tar.gz
Merge branch '41247-timestamp' into 'master'
Use last_edited_at instead of updated_at for displaying issuable last change Closes #41247 See merge request gitlab-org/gitlab-ce!16406
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/concerns/issuable_actions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb
index 74a4f437dc8..337957c366d 100644
--- a/app/controllers/concerns/issuable_actions.rb
+++ b/app/controllers/concerns/issuable_actions.rb
@@ -45,7 +45,7 @@ module IssuableActions
}
if issuable.edited?
- response[:updated_at] = issuable.updated_at
+ response[:updated_at] = issuable.last_edited_at.to_time.iso8601
response[:updated_by_name] = issuable.last_edited_by.name
response[:updated_by_path] = user_path(issuable.last_edited_by)
end