Merge branch 'standalone_develop' into pre_trustie_server
This commit is contained in:
commit
f7d3e7acdf
|
@ -56,7 +56,7 @@ class SitePagesController < ApplicationController
|
||||||
|
|
||||||
project = Project.find_by(identifier: params[:repository][:name],user_id: user.id)
|
project = Project.find_by(identifier: params[:repository][:name],user_id: user.id)
|
||||||
return normal_status(-1, '项目不存在') if project.nil?
|
return normal_status(-1, '项目不存在') if project.nil?
|
||||||
return normal_status(-1, '该仓库还未开通Page服务,无法进行部署') if Page.exists?(user: user, project: project)
|
return normal_status(-1, '该仓库还未开通Page服务,无法进行部署') unless Page.exists?(user: user, project: project)
|
||||||
|
|
||||||
@page = Page.find_by(user: user, project: project)
|
@page = Page.find_by(user: user, project: project)
|
||||||
response_str = @page.deploy_page(branch)
|
response_str = @page.deploy_page(branch)
|
||||||
|
|
Loading…
Reference in New Issue