diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-07-16 09:52:37 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-10 08:02:23 -0700 |
| commit | e051a558ce322de41895e9594c18e727139aba4c (patch) | |
| tree | 9496a2e3e63f4bd5b036c02128cc9f2777889e0e | |
| parent | 77f37fa9094443abe8e60ebd09a82e94d0a0047b (diff) | |
| download | gitlab-ce-e051a558ce322de41895e9594c18e727139aba4c.tar.gz | |
Bump Haml to 4.0.7 to speed up textarea rendering
Closes #1987
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index ebffc0d90ab..6c85829ee83 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.14.0 (unreleased) + - Bump Haml to 4.0.7 to speed up textarea rendering (Stan Hu) - Show incompatible projects in Bitbucket import status (Stan Hu) - Fix coloring of diffs on MR Discussion-tab (Gert Goet) - Fix "Network" and "Graphs" pages for branches with encoded slashes (Stan Hu) diff --git a/Gemfile.lock b/Gemfile.lock index 643c513161f..26ca8ad0b00 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) |