summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-05 11:18:47 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-05 11:18:47 +0200
commit7b4225bdb2b924b5d74fe5f30a193433824cc817 (patch)
treee529bee2d20f4ba8744a27c4d35510ad097db0c2
parent6caa03d42214fcda6ef519b7361be85af8d7df09 (diff)
parent88a3cfe1070bbd7db450f68b8fc2b509c795e413 (diff)
downloadgitlab-ce-7b4225bdb2b924b5d74fe5f30a193433824cc817.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--lib/rouge/formatters/html_gitlab.rb2
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)