summaryrefslogtreecommitdiff
path: root/lib/coderay/helpers
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-07-14 02:49:16 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-07-14 02:49:16 +0200
commitbf395bd14ed7f63aab84955f6768f59965e3a73e (patch)
tree870e3ee4980401f43c2dc9a34d2e8343ef3a20ca /lib/coderay/helpers
parentffe0c90999c0b7255a5dfc608c84e683440475b1 (diff)
parent7493dcbfded42686169027a158c18c5312a3af24 (diff)
downloadcoderay-bf395bd14ed7f63aab84955f6768f59965e3a73e.tar.gz
Merge branch 'master' into cleanup-output
Diffstat (limited to 'lib/coderay/helpers')
-rw-r--r--lib/coderay/helpers/file_type.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb
index 19f27ac..5e3a1e7 100644
--- a/lib/coderay/helpers/file_type.rb
+++ b/lib/coderay/helpers/file_type.rb
@@ -86,6 +86,7 @@ module CodeRay
'dpr' => :delphi,
'erb' => :erb,
'gemspec' => :ruby,
+ 'go' => :go,
'groovy' => :groovy,
'gvy' => :groovy,
'h' => :c,
@@ -96,6 +97,7 @@ module CodeRay
'java' => :java,
'js' => :java_script,
'json' => :json,
+ 'lua' => :lua,
'mab' => :ruby,
'pas' => :delphi,
'patch' => :diff,
@@ -115,7 +117,7 @@ module CodeRay
'rhtml' => :erb,
'rjs' => :ruby,
'rpdf' => :ruby,
- 'ru' => :ruby,
+ 'ru' => :ruby, # config.ru
'rxml' => :ruby,
'sass' => :sass,
'sql' => :sql,
@@ -139,6 +141,9 @@ module CodeRay
'Rakefile' => :ruby,
'Rantfile' => :ruby,
'Gemfile' => :ruby,
+ 'Guardfile' => :ruby,
+ 'Vagrantfile' => :ruby,
+ 'Appraisals' => :ruby
}
end