Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
73edea02d3
commit
62fcb9ffa9
|
@ -35,6 +35,8 @@ def insert_data(path)
|
|||
|
||||
files.each do |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)
|
||||
puts "#{Time.now} Inserted #{result.cmd_tuples} lines in #{filename}, DB response: #{result.cmd_status}"
|
||||
end
|
||||
|
|
|
@ -230,7 +230,7 @@ describe Banzai::Pipeline::WikiPipeline do
|
|||
]
|
||||
|
||||
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|
|
||||
it "doesn't include a prohibited slug in a (.) relative link '#{link}'" do
|
||||
output = described_class.to_html(
|
||||
|
|
Loading…
Reference in New Issue