Fix up merge issues

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,

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)

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