Merge branch 'master' of https://git.trustie.net/jasder/forgeplus

动态导航权限控制，没有勾选模块不能进入页面，语言过滤0.0%

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 
-## [v3.0.0](https://github.com/go-gitea/gitea/releases/tag/v1.13.1) - 2020-12-29
+## [v3.0.1](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-03-19
+
+* BUGFIXES
+  * Fix pull reqeust模块中用户头像显示问题
+  * Fix 解决issue模块中，指派用户的问题
+  * Fix 解决合并请求失败的后显示message信息不正确
+  * Fix 代码目录页面，readme文件提供单独的api
+
+* ENHANCEMENTS
+  * 重构项目详情页面
+
+## [v3.0.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2020-12-29
 
 * BUGFIXES
   * Fix pull reqeust的访问权限问题 (#14156) (#14171)

README.md

@@ -93,26 +93,26 @@ http://localhost:3000/
 
 - 代码库
 
-![](docs/figs/code.png)
+![](docs/figs/code.png?raw=true)
 
 
 - 任务管理
-![](docs/figs/issue_manage.png)
+![](docs/figs/issue_manage.png?raw=true)
 
 - 任务查看
 
-![](docs/figs/issue_view.png)
+![](docs/figs/issue_view.png?raw=true)
 
 - 任务指派
 
-![](docs/figs/issue_assign2.png)
+![](docs/figs/issue_assign2.png?raw=true)
 
 - 里程碑
 
-![](docs/figs/milestone.png)
+![](docs/figs/milestone.png?raw=true)
 
 ### API
-- [API](api_document.md)
+- [API文档](https://forgeplus.trustie.net/docs/api)
 - [API](showdoc.com.cn)
   账号：forgeplus@admin.com 密码：forge123
 

app/views/repositories/detail.json.jbuilder

@@ -1,6 +1,10 @@
 json.content @project.content
 json.website @project.website
-json.readme @result[:readme].merge(content: readme_render_decode64_content(@result[:readme]["content"], nil))
+if @result[:readme].blank?
+  json.readme nil!
+else
+  json.readme @result[:readme].merge(content: readme_render_decode64_content(@result[:readme]["content"], nil))
+end
 json.identifier render_identifier(@project)
 json.name @project.name
 json.project_id @project.id
@@ -48,7 +52,7 @@ if @result[:repo]
   json.private @result[:repo]['private']
 end
 json.license_name @project.license_name
-json.release_versions do 
+json.release_versions do
   json.list @result[:release].each do |release|
     forge_version = VersionRelease.find_by(version_gid: release["id"])
     json.id forge_version&.id
@@ -58,23 +62,23 @@ json.release_versions do
   end
   json.total_count @result[:release].size
 end
-json.branches do 
+json.branches do
   json.list @result[:branch].each do |branch|
     json.name branch["name"]
   end
   json.total_count @result[:branch].size
 end
-json.tags do 
-  json.list @result[:tag].each do |tag| 
+json.tags do
+  json.list @result[:tag].each do |tag|
     json.name tag["name"]
   end
-  json.total_count @result[:tag].size 
+  json.total_count @result[:tag].size
 end
-json.contributors do 
-  total_count = @result[:contributor].size 
+json.contributors do
+  total_count = @result[:contributor].size
   json.list @result[:contributor].each do |contributor|
     user = User.find_by(gitea_uid: contributor["id"])
-    if contributor["login"] == "root" 
+    if contributor["login"] == "root"
       total_count -= 1
       next
     end