Merge branch 'standalone_develop' into pre_trustie_server

app/views/api/v1/project_topics/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.total_count @project_topics.total_count
+json.project_topics @project_topics.each do |topic| 
+  json.(topic, :id, :name, :projects_count)
+end

app/views/projects/_project_detail.json.jbuilder

@@ -50,3 +50,6 @@ json.language do
     json.name project.project_language.name
   end
 end
+json.topics project.project_topics.each do |topic| 
+  json.(topic, :id, :name)
+end

app/views/projects/index.json.jbuilder

@@ -48,4 +48,7 @@ json.projects @projects do |project|
       json.name project.project_language.name
     end
   end
+  json.topics project.project_topics.each do |topic| 
+    json.(topic, :id, :name)
+  end
 end

app/views/projects/update.json.jbuilder

@@ -6,4 +6,7 @@ json.project_category_id @project.project_category_id
 json.project_language_id @project.project_language_id
 json.is_public @project.is_public
 json.website @project.website
-json.lesson_url @project.lesson_url
+json.lesson_url @project.lesson_url
+json.topics @project.project_topics.each do |topic| 
+  json.(topic, :id, :name)
+end

app/views/repositories/detail.json.jbuilder

@@ -21,6 +21,9 @@ json.mirror_url @project&.repository.remote_mirror_url
 json.mirror @project&.repository.mirror_url.present?
 json.type @project.numerical_for_project_type
 json.open_devops @project.open_devops?
+json.topics @project.project_topics.each do |topic| 
+  json.(topic, :id, :name)
+end
 
 unless @project.common?
   json.mirror_status @repository.mirror_status