Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 0 deletions

diff --git a/app/models/projects/project_topic.rb b/app/models/projects/project_topic.rb
new file mode 100644
index 00000000000..d4b456ef482
--- /dev/null
+++ b/app/models/projects/project_topic.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Projects
+  class ProjectTopic < ApplicationRecord
+    belongs_to :project
+    belongs_to :topic
+  end
+end
diff --git a/app/models/projects/topic.rb b/app/models/projects/topic.rb
new file mode 100644
index 00000000000..a17aa550edb
--- /dev/null
+++ b/app/models/projects/topic.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Projects
+  class Topic < ApplicationRecord
+    validates :name, presence: true, uniqueness: true, length: { maximum: 255 }
+
+    has_many :project_topics, class_name: 'Projects::ProjectTopic'
+    has_many :projects, through: :project_topics
+  end
+end