Merge branch 'dev_trustie' into dev_devops

app/views/repositories/show.json.jbuilder

@@ -12,7 +12,7 @@ json.versions_count @project.versions_count  #里程碑数量
 json.version_releases_count @project.releases_size(@user.try(:id), "all")
 json.version_releasesed_count @project.releases_size(@user.try(:id), "released")  #已发行的版本
 json.contributor_users_count @project.contributor_users
-json.permission  User.current.admin? ? "Mananger" : @project.get_premission(@user)
+json.permission  User.current.admin? ? "Manager" : @project.get_premission(@user)
 json.mirror_url @project&.repository.mirror_url
 json.mirror @project&.repository.mirror_url.present?
 json.type @project.numerical_for_project_type