diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-04 14:08:49 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-04 14:08:49 +0000 |
| commit | 88a3cfe1070bbd7db450f68b8fc2b509c795e413 (patch) | |
| tree | 18e04980045f81bf8e63ae287190d293b9a8dd3d | |
| parent | 326b827ce39f998ce75f58e9f649e6b50623f1aa (diff) | |
| parent | fa5efea7f315d6eda05fa8215070979906cd1f02 (diff) | |
| download | gitlab-ce-88a3cfe1070bbd7db450f68b8fc2b509c795e413.tar.gz | |
Merge branch 'rs-fix-rouge-inline-theme' into 'master'
Fix the `inline_theme` option for the Rouge formatter
See merge request !1083
| -rw-r--r-- | lib/rouge/formatters/html_gitlab.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rouge/formatters/html_gitlab.rb b/lib/rouge/formatters/html_gitlab.rb index 092a920a0c4..3f92212243d 100644 --- a/lib/rouge/formatters/html_gitlab.rb +++ b/lib/rouge/formatters/html_gitlab.rb @@ -47,7 +47,7 @@ module Rouge @lineanchors = lineanchors @lineanchorsid = lineanchorsid @anchorlinenos = anchorlinenos - @inline_theme = Theme.find(@inline_theme).new if @inline_theme.is_a?(String) + @inline_theme = Theme.find(inline_theme).new if inline_theme.is_a?(String) end def render(tokens) |