diff --git a/CHANGELOG b/CHANGELOG index ebffc0d90ab6a5582882fcafba191d643b19195a..6c85829ee83be5c8ee356466633ccac85a203f00 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 643c513161f6037b1cf7576f106994b880e8fb09..26ca8ad0b000490dc21643fc2f5ec435184b0512 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)