diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-02 17:30:58 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-02 17:30:58 +0100 |
| commit | b2d577a7a293ac6c82a8bc64f5b134558460df5b (patch) | |
| tree | faefbf876aa9a9de692ae8c63cbf8c8c90907951 | |
| parent | 5a4a08249055022e9e6e30d9ab38c45c1bf71842 (diff) | |
| download | gitlab-ce-fix-realtime-edited-text-for-issues-9-3.tar.gz | |
Fix up merge issuesfix-realtime-edited-text-for-issues-9-3
| -rw-r--r-- | app/assets/javascripts/issue_show/components/app.vue | 3 | ||||
| -rw-r--r-- | app/helpers/issuables_helper.rb | 4 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index 75d42b1eb1b..e14414d3f68 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -117,6 +117,9 @@ export default { formState() { return this.store.formState; }, + hasUpdated() { + return !!this.state.updatedAt; + }, }, components: { descriptionComponent, diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 0269a4cc4e2..5e8f0849969 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -219,7 +219,9 @@ module IssuablesHelper initialDescriptionText: issuable.description } - data.merge(updated_at_by(issue)) + data.merge!(updated_at_by(issuable)) + + data.to_json end def updated_at_by(issuable) diff --git a/db/schema.rb b/db/schema.rb index fa1c5dc15c4..368b8e99c78 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1446,8 +1446,8 @@ ActiveRecord::Schema.define(version: 20170525174156) do t.string "token" t.boolean "pipeline_events", default: false, null: false t.boolean "confidential_issues_events", default: false, null: false - t.boolean "job_events", default: false, null: false t.boolean "repository_update_events", default: false, null: false + t.boolean "job_events", default: false, null: false end add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree |