Commit 630a9421 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'optimize-haml-textarea-rendering' into 'master'

Bump Haml to 4.0.7 to speed up textarea rendering

The current regexp caused long load times when textarea blocks were surrounded by whitespace. This fix has been submitted to the Haml library and passes tests there:

https://github.com/haml/haml/pull/850

Closes #1987

See merge request !984
parents fed202f6 e051a558
...@@ -4,6 +4,7 @@ v 7.14.0 (unreleased) ...@@ -4,6 +4,7 @@ v 7.14.0 (unreleased)
- Disable turbolinks when linking to Bitbucket import status (Stan Hu) - Disable turbolinks when linking to Bitbucket import status (Stan Hu)
- Fix broken code import and display error messages if something went wrong with creating project (Stan Hu) - Fix broken code import and display error messages if something went wrong with creating project (Stan Hu)
- Fix corrupted binary files when using API files endpoint (Stan Hu) - Fix corrupted binary files when using API files endpoint (Stan Hu)
- Bump Haml to 4.0.7 to speed up textarea rendering (Stan Hu)
- Show incompatible projects in Bitbucket import status (Stan Hu) - Show incompatible projects in Bitbucket import status (Stan Hu)
- Fix coloring of diffs on MR Discussion-tab (Gert Goet) - Fix coloring of diffs on MR Discussion-tab (Gert Goet)
- Fix "Network" and "Graphs" pages for branches with encoded slashes (Stan Hu) - Fix "Network" and "Graphs" pages for branches with encoded slashes (Stan Hu)
......
...@@ -307,7 +307,7 @@ GEM ...@@ -307,7 +307,7 @@ GEM
grape-entity (0.4.2) grape-entity (0.4.2)
activesupport activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
haml (4.0.5) haml (4.0.7)
tilt tilt
haml-rails (0.5.3) haml-rails (0.5.3)
actionpack (>= 4.0.1) actionpack (>= 4.0.1)
......
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