kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2019-12-22 06:07:52 +00:00
parent 73edea02d3
commit 62fcb9ffa9
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/insert-rspec-profiling-data
View file

@ -35,6 +35,8 @@ def insert_data(path)
files.each do |filename| files.each do |filename|
puts "#{Time.now} Inserting #{filename}..." puts "#{Time.now} Inserting #{filename}..."
# Strip file of NULL bytes to ensure data gets inserted
system("sed", "-i", "-e", "s/\\x00//g", filename)
result = RspecProfiling::Collectors::PSQL::Result.copy_from(filename) result = RspecProfiling::Collectors::PSQL::Result.copy_from(filename)
puts "#{Time.now} Inserted #{result.cmd_tuples} lines in #{filename}, DB response: #{result.cmd_status}" puts "#{Time.now} Inserted #{result.cmd_tuples} lines in #{filename}, DB response: #{result.cmd_status}"
end end

2
spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
View file

@ -230,7 +230,7 @@ describe Banzai::Pipeline::WikiPipeline do
] ]
invalid_slugs.each do |slug| invalid_slugs.each do |slug|
context "with the invalid slug #{slug}" do context "with the invalid slug #{slug.delete("\000")}" do
invalid_js_links.each do |link| invalid_js_links.each do |link|
it "doesn't include a prohibited slug in a (.) relative link '#{link}'" do it "doesn't include a prohibited slug in a (.) relative link '#{link}'" do
output = described_class.to_html( output = described_class.to_html(