From 59a89db3ad0a00e709df9345a660189d3b402665 Mon Sep 17 00:00:00 2001
From: 0x1eef <0x1eef@protonmail.com>
Date: Thu, 23 May 2024 22:44:47 -0300
Subject: [PATCH] Add model/mixin/colorable

---
 server/lib/twenty/server.rb                             | 1 -
 server/lib/twenty/server/mixin.rb                       | 5 -----
 server/lib/twenty/server/model.rb                       | 1 +
 server/lib/twenty/server/{ => model}/mixin/colorable.rb | 0
 4 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 server/lib/twenty/server/mixin.rb
 rename server/lib/twenty/server/{ => model}/mixin/colorable.rb (100%)

diff --git a/server/lib/twenty/server.rb b/server/lib/twenty/server.rb
index a57dc4b..6ec2334 100644
--- a/server/lib/twenty/server.rb
+++ b/server/lib/twenty/server.rb
@@ -59,7 +59,6 @@ module Twenty
   end
 
   require "sequel"
-  require_relative "server/mixin"
   require_relative "server/migration"
   require_relative "server/graphql"
   require_relative "server/rack"
diff --git a/server/lib/twenty/server/mixin.rb b/server/lib/twenty/server/mixin.rb
deleted file mode 100644
index 09db885..0000000
--- a/server/lib/twenty/server/mixin.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module Twenty::Mixin
-  require_relative "mixin/colorable"
-end
diff --git a/server/lib/twenty/server/model.rb b/server/lib/twenty/server/model.rb
index b6415ce..e51a674 100644
--- a/server/lib/twenty/server/model.rb
+++ b/server/lib/twenty/server/model.rb
@@ -6,6 +6,7 @@ module Twenty::Model
     model.plugin(:timestamps, update_on_create: true)
   end
 
+  require_relative "model/mixin/colorable"
   require_relative "model/project"
   require_relative "model/task"
   require_relative "model/milestone"
diff --git a/server/lib/twenty/server/mixin/colorable.rb b/server/lib/twenty/server/model/mixin/colorable.rb
similarity index 100%
rename from server/lib/twenty/server/mixin/colorable.rb
rename to server/lib/twenty/server/model/mixin/colorable.rb