From c63e20ce7da7589852bb33409c49785855d65d47 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Tue, 29 Dec 2020 00:26:58 +0900
Subject: [PATCH] Resurrect ActivityComponent for binary compatibility in
 4.35.1 (#2612)

---
 .../scala/gitbucket/core/model/Activity.scala | 24 +++++++++----------
 .../scala/gitbucket/core/model/Profile.scala  |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/scala/gitbucket/core/model/Activity.scala b/src/main/scala/gitbucket/core/model/Activity.scala
index 0466525d9..a7ca6fb49 100644
--- a/src/main/scala/gitbucket/core/model/Activity.scala
+++ b/src/main/scala/gitbucket/core/model/Activity.scala
@@ -1,19 +1,19 @@
 package gitbucket.core.model
 
-// /**
-//  * ActivityComponent has been deprecated, but keep it for binary compatibility.
-//  */
-// @deprecated("ActivityComponent has been deprecated, but keep it for binary compatibility.", "4.34.0")
-// trait ActivityComponent extends TemplateComponent { self: Profile =>
-//   import profile.api._
-//   import self._
+/**
+ * ActivityComponent has been deprecated, but keep it for binary compatibility.
+ */
+@deprecated("ActivityComponent has been deprecated, but keep it for binary compatibility.", "4.34.0")
+trait ActivityComponent extends TemplateComponent { self: Profile =>
+  import profile.api._
+  import self._
 
-//   lazy val Activities = TableQuery[Activities]
+  lazy val Activities = TableQuery[Activities]
 
-//   class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
-//     def * = ???
-//   }
-// }
+  class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate {
+    def * = ???
+  }
+}
 
 case class Activity(
   userName: String,
diff --git a/src/main/scala/gitbucket/core/model/Profile.scala b/src/main/scala/gitbucket/core/model/Profile.scala
index 2d746fa4d..75ed43fb3 100644
--- a/src/main/scala/gitbucket/core/model/Profile.scala
+++ b/src/main/scala/gitbucket/core/model/Profile.scala
@@ -45,6 +45,7 @@ trait CoreProfile
     with Profile
     with AccessTokenComponent
     with AccountComponent
+    with ActivityComponent
     with CollaboratorComponent
     with CommitCommentComponent
     with CommitStatusComponent