From 8b8ad0056f579e57b1518acb7e99c0018fbf4cf7 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 24 Mar 2017 19:49:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC=E5=BA=93fo?= =?UTF-8?q?rk=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 7 +------ app/views/myshixuns/_myshixun_top.html.erb | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 5249a07e2..e18fbae05 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -35,12 +35,7 @@ class ShixunsController < ApplicationController s = Trustie::Gitlab::Sync.new s.sync_user(User.current) end - if @shixun.gpid - gshixun = g.project(@shixun.gpid) - else - gshixun = g.fork(@shixun.gpid, User.current.gid) - end - + gshixun = g.fork(@shixun.gpid, User.current.gid) if gshixun.id myshixun = copy_myshixun(@shixun, gshixun) challenges = @shixun.challenges diff --git a/app/views/myshixuns/_myshixun_top.html.erb b/app/views/myshixuns/_myshixun_top.html.erb index 21a9a4bfa..2556fd6a6 100644 --- a/app/views/myshixuns/_myshixun_top.html.erb +++ b/app/views/myshixuns/_myshixun_top.html.erb @@ -4,7 +4,7 @@