diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 67bb3ed60..0504c95a8 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -220,19 +220,6 @@ class PullRequestsController < ApplicationController # connect jenkins client_jenkins = JenkinsApi::Client.new(:server_url => jenkins_address, :username => jenkins_username, :password => jenkins_password) @output = client_jenkins.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'html')["output"] - pr.update_column(:jenkins_output, @output) - # @output2 = @output.gsub("\n", "\r\n") - # @output2 = @output.gsub("\n", "\r") - @output3 = @output.gsub("\r\n", "") - @output4 = @output.gsub("\n", "") - # @output4 = @output.gsub("\r\n", "\r") - # @output5 = @output.gsub("\r", "\n") - # @output6 = @output.gsub("\r", "\r\n") - # @output7 = @output.gsub("\t", "\t\n") - # @output8 = @output.gsub("\t", "\n") - # @output9 = @output.gsub("\t", "\r") - logger.info("jenkins ###########################{@output}") - logger.info("jenkins 1111111111111111111111111##{@output2}") end diff --git a/app/views/pull_requests/pr_console.html.erb b/app/views/pull_requests/pr_console.html.erb index d569fe8a2..ad31a4a2a 100644 --- a/app/views/pull_requests/pr_console.html.erb +++ b/app/views/pull_requests/pr_console.html.erb @@ -3,16 +3,3 @@
<%= @output.html_safe %>- -