Merge branch 'develop' into trustie_server

app/controllers/projects_controller.rb

@@ -11,7 +11,7 @@ class ProjectsController < ApplicationController
     menu = []
 
     menu.append(menu_hash_by_name("home"))
-    menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
+    menu.append(menu_hash_by_name("code")) 
     menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
     menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls")
     menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops")
@@ -26,7 +26,7 @@ class ProjectsController < ApplicationController
     scope = Projects::ListQuery.call(params)
 
     # @projects = kaminari_paginate(scope)
-    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner)
+    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
 
     category_id = params[:category_id]
     @total_count =

app/controllers/repositories_controller.rb

@@ -18,7 +18,6 @@ class RepositoriesController < ApplicationController
 
   # 新版项目详情
   def detail 
-    return render_not_found unless @project.has_menu_permission("code")
     @user = current_user  
     @result = Repositories::DetailService.call(@owner, @repository, @user)
     @project_fork_id = @project.try(:forked_from_project_id)

app/services/projects/create_service.rb

@@ -46,7 +46,6 @@ class Projects::CreateService < ApplicationService
     {
       hidden: !repo_is_public,
       user_id: params[:user_id],
-      website: params[:website],
       identifier: params[:repository_name]
     }
   end

app/views/repositories/detail.json.jbuilder

@@ -1,6 +1,10 @@
 json.content @project.content
 json.website @project.website
+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