diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-02 01:40:53 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-02 01:40:53 +0000 |
| commit | 2bb8c1caa583e1efbc207c4093ea2159bfcc1db1 (patch) | |
| tree | f3d13a7853288ce307e7759a069f8599d9567061 | |
| parent | 0ef1060e14b8ac09159e466fe5f4ca3195e080c2 (diff) | |
| parent | 21a5e70bf49363881c1215fe695255db61df7cba (diff) | |
| download | gitlab-ce-2bb8c1caa583e1efbc207c4093ea2159bfcc1db1.tar.gz | |
Merge branch 'rouge-3.3.0' into 'master'
Update to Rouge 3.3.0 including frozen string literals for improved memory usage
See merge request gitlab-org/gitlab-ce!22035
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/rouge-3-3-0.yml | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 910e07f4a66..69a1c899cc5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -729,7 +729,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 5959dc0e114..30605e460e6 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -738,7 +738,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.2.1) + rouge (3.3.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) diff --git a/changelogs/unreleased/rouge-3-3-0.yml b/changelogs/unreleased/rouge-3-3-0.yml new file mode 100644 index 00000000000..7cf6c75920a --- /dev/null +++ b/changelogs/unreleased/rouge-3-3-0.yml @@ -0,0 +1,6 @@ +--- +title: Update to Rouge 3.3.0 including frozen string literals for improved memory + usage +merge_request: +author: +type: changed |