[fix #158] Fixed bug with render in BlobController#raw

app/helpers/wiki_helper.rb

@@ -37,7 +37,7 @@ module WikiHelper
     name == 'Home' ? project_wiki_index_path(project) : project_wiki_path(project, name)
   end
 
-  def formats
+  def wiki_formats
     APP_CONFIG['wiki_formats'].map do |key, val|
       [ val, key.to_s ]
     end.sort do |a, b|

app/views/wiki/_editor_toolbar.html.haml

@@ -44,7 +44,7 @@
       %span= t("layout.wiki.editor.help")
 
   #gollum-editor-format-selector
-    = select_tag :format, options_for_select(formats, format), :id => "wiki_format"
+    = select_tag :format, options_for_select(wiki_formats, format), :id => "wiki_format"
     = label_tag :format, t("layout.wiki.editor.format")
 #gollum-editor-help.jaws
   %ul#gollum-editor-help-parent