diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-22 16:29:49 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-31 11:35:05 +0100 |
commit | aa1d87bd81df0c4020f2cee7788d1f8ea1635838 (patch) | |
tree | af5cf0e05afcb2d1719d6c7c16ac6c343be1c2ee /app/helpers | |
parent | d537a9a45b23bac1aaff028302aae515d6afe949 (diff) | |
download | gitlab-ce-aa1d87bd81df0c4020f2cee7788d1f8ea1635838.tar.gz |
Fix helper methods returning wrong data types for vue
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/editable_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/issuables_helper.rb | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/helpers/editable_helper.rb b/app/helpers/editable_helper.rb index e3ad62e8c18..166963f993d 100644 --- a/app/helpers/editable_helper.rb +++ b/app/helpers/editable_helper.rb @@ -1,6 +1,6 @@ module EditableHelper def updated_at_by(editable) - return nil unless editable.is_edited? + return {} unless editable.is_edited? { updated_at: editable.updated_at, diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 39982eb2e2c..f995c86c059 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -276,9 +276,13 @@ module IssuablesHelper end def issuable_app_data(project, issue) - data = { "endpoint" => realtime_changes_namespace_project_issue_path(project.namespace, project, issue), "can-update" => can?(current_user, :update_issue, issue).to_s, "issuable-ref" => issue.to_reference } + data = { + endpoint: realtime_changes_namespace_project_issue_path(project.namespace, project, issue), + 'can-update' => can?(current_user, :update_issue, issue).to_s, + 'issuable-ref' => issue.to_reference || '' + } updated_at_by = updated_at_by(issue) - data.merge(updated_at_by) if updated_at_by.present? + data.merge(updated_at_by) end end |