diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 17:10:45 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 17:10:45 +0000 |
| commit | 630a9421ed66b7f9511227d22c1056e133738baf (patch) | |
| tree | b15826b11cdcb0fda9bca7d975dfb1da9f0f5523 /Gemfile.lock | |
| parent | fed202f6774838d5c5f3fe9b4b31fb03945b6868 (diff) | |
| parent | e051a558ce322de41895e9594c18e727139aba4c (diff) | |
| download | gitlab-ce-630a9421ed66b7f9511227d22c1056e133738baf.tar.gz | |
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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 27535be46ef..bff605df65e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -307,7 +307,7 @@ GEM grape-entity (0.4.2) activesupport multi_json (>= 1.3.2) - haml (4.0.5) + haml (4.0.7) tilt haml-rails (0.5.3) actionpack (>= 4.0.1) |