jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix

This commit is contained in:
caishi 2019-10-10 16:58:36 +08:00
parent 759a50d088 86c8cdc35e
commit 840eb28434
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -15,7 +15,6 @@
/public/tmp/* /public/tmp/*
/tmp/* /tmp/*
/public/cache/* /public/cache/*
.gitignore
/config/newrelic.yml /config/newrelic.yml
/public/images/avatars/* /public/images/avatars/*
/Gemfile /Gemfile
@ -40,3 +39,6 @@ public/javascripts/wechat/node_modules/
tmux*.log tmux*.log
config/wechat.yml config/wechat.yml
config/oneapm.yml config/oneapm.yml
/vendor
README.rdoc

2
app/controllers/pull_requests_controller.rb
View File

@ -107,7 +107,7 @@ class PullRequestsController < ApplicationController
# 自动生成配置Jenkinsjob，在merge事件的时候触发jenkins、sonar # 自动生成配置Jenkinsjob，在merge事件的时候触发jenkins、sonar
# merge发送的时候还没有接收，所以分析对象应该源项目 # merge发送的时候还没有接收，所以分析对象应该源项目
language = swith_language_type(@project.language) language = swith_language_type(@project.language)
exec_jenkins(source_branch, @project.gpid, git_url, job_name, language) # exec_jenkins(source_branch, @project.gpid, git_url, job_name, language)
logger.info("33333333333333333333") logger.info("33333333333333333333")
qa = QualityAnalysis.create(:project_id => @project.id, :author_login => User.current.login, :sonar_version => 1, :path => "./", qa = QualityAnalysis.create(:project_id => @project.id, :author_login => User.current.login, :sonar_version => 1, :path => "./",
:branch => source_branch, :language => "java", :sonar_name => "#{job_name}") :branch => source_branch, :language => "java", :sonar_name => "#{job_name}")