Merge branch 'develop' into standalone_develop

app/views/repositories/detail.json.jbuilder

@@ -51,8 +51,8 @@ if @result[:repo]
   json.private @result[:repo]['private']
 end
 json.license_name @project.license_name
-json.branches_count @result[:branch_tag_total_count]['branch_count'] || 0
-json.tags_count @result[:branch_tag_total_count]['tag_count'] || 0
+json.branches_count @result[:branch_tag_total_count].present? ? (@result[:branch_tag_total_count]['branch_count'] || 0) : 0
+json.tags_count @result[:branch_tag_total_count].present? ? (@result[:branch_tag_total_count]['tag_count'] || 0) : 0
 json.contributors do
   total_count = @result[:contributor].size
   json.list @result[:contributor].each do |contributor|