Commit 3b9792ec authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-long-blob-timeout' into 'master'

Fix timeout when rendering file with thousands of lines.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2354.

See merge request !771
parents 3f59a8f0 9a50db69
Please view this file on the master branch, on stable branches it's out of date.
v 7.12.0 (unreleased)
- Fix timeout when rendering file with thousands of lines.
- Don't notify users mentioned in code blocks or blockquotes.
- Omit link to generate labels if user does not have access to create them (Stan Hu)
- Disable changing of the source branch in merge request update API (Stan Hu)
......
......@@ -4,7 +4,8 @@
- blob.data.lines.to_a.size.times do |index|
- offset = defined?(first_line_number) ? first_line_number : 1
- i = index + offset
= link_to "#L#{i}", id: "L#{i}", rel: "#L#{i}" do
/ We're not using `link_to` because it is too slow once we get to thousands of lines.
%a{href: "#L#{i}", id: "L#{i}", rel: "#L#{i}"}
%i.fa.fa-link
= i
:preserve
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment