From b2d577a7a293ac6c82a8bc64f5b134558460df5b Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Fri, 2 Jun 2017 17:30:58 +0100
Subject: [PATCH] Fix up merge issues

---
 app/assets/javascripts/issue_show/components/app.vue | 3 +++
 app/helpers/issuables_helper.rb                      | 4 +++-
 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
-- 
GitLab