From 269a15c7f293cf56f85cf6ec42920505535fbccf Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Wed, 10 Nov 2021 17:03:13 +0100
Subject: [PATCH] merge

---
 app/models/research/journal/article.rb | 2 +-
 db/schema.rb                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/research/journal/article.rb b/app/models/research/journal/article.rb
index 2fb8ca12d..32157535e 100644
--- a/app/models/research/journal/article.rb
+++ b/app/models/research/journal/article.rb
@@ -11,7 +11,7 @@
 #  references                 :text
 #  title                      :string
 #  created_at                 :datetime         not null
-#  updated_at                 :date             not null
+#  updated_at                 :datetime         not null
 #  research_journal_id        :uuid             not null
 #  research_journal_volume_id :uuid
 #  university_id              :uuid             not null
diff --git a/db/schema.rb b/db/schema.rb
index e6377a5f4..2b2ddeffa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -376,7 +376,7 @@ ActiveRecord::Schema.define(version: 2021_11_09_093030) do
     t.uuid "research_journal_id", null: false
     t.uuid "research_journal_volume_id"
     t.datetime "created_at", precision: 6, null: false
-    t.date "updated_at", null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.uuid "updated_by_id"
     t.text "abstract"
     t.text "references"
-- 
GitLab