From 4b3f45bccef522af255e159673770093e9046126 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 15 May 2020 18:00:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=8F=8A?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 6 +++--- app/services/projects/fork_service.rb | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 26e022052..a268f7e25 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -83,17 +83,17 @@ class ProjectsController < ApplicationController end def watch_users - watchers = @project.watchers.includes(:user).distinct + watchers = @project.watchers.includes(:user).order("watchers.created_at asc").distinct @watchers = paginate(watchers) end def praise_users - praises = @project.praise_treads.includes(:user).distinct + praises = @project.praise_treads.includes(:user).order("praise_treads.created_at asc").distinct @praises = paginate(praises) end def fork_users - fork_users = @project.fork_users.includes(:user, :project).distinct + fork_users = @project.fork_users.includes(:user, :project).order("fork_users.created_at asc").distinct @fork_users = paginate(fork_users) end diff --git a/app/services/projects/fork_service.rb b/app/services/projects/fork_service.rb index 3c24455ff..f2cdca409 100644 --- a/app/services/projects/fork_service.rb +++ b/app/services/projects/fork_service.rb @@ -27,6 +27,8 @@ class Projects::ForkService < ApplicationService @project.update_column('forked_count', @project&.forked_count.to_i + 1) new_repository.update_column('url', result['clone_url']) if result + + ForkUser.create(project_id: @project.id, fork_project_id: clone_project.id, user_id: clone_project.user_id) clone_project end