Merge branch 'pre_trustie_server' into trustie_server

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