diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-15 00:18:49 -0700 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-15 00:18:49 -0700 |
commit | 17bd6b13bcc9eb43c9fe972a73446652d72fca13 (patch) | |
tree | 3ee97d62d42385ce2d7174c30d08e7a4f4f91741 | |
parent | e84411ef3373c053f6b4c1cbff5948369684ac65 (diff) | |
parent | 465a195117138194a51487b8d1c6cd161890e88d (diff) | |
download | gitlab-ce-17bd6b13bcc9eb43c9fe972a73446652d72fca13.tar.gz |
Merge pull request #821 from oreofish/showmarkdown
show rendered file if it is .markdown file
-rw-r--r-- | app/views/refs/_tree_file.html.haml | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/app/views/refs/_tree_file.html.haml b/app/views/refs/_tree_file.html.haml index c5512f69b51..93985843101 100644 --- a/app/views/refs/_tree_file.html.haml +++ b/app/views/refs/_tree_file.html.haml @@ -9,14 +9,20 @@ = link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path]), :class => "right", :target => "_blank" = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right", :style => "margin-right:10px;" - if file.text? - .view_file_content - - unless file.empty? - %div{:class => current_user.dark_scheme ? "black" : "white"} + - if name =~ /\.(md|markdown)$/i + #tree-readme-holder + .readme = preserve do - = raw file.colorize(options: { linenos: 'True'}) - - else - %h3 - %center Empty file + = markdown(file.data) + - else + .view_file_content + - unless file.empty? + %div{:class => current_user.dark_scheme ? "black" : "white"} + = preserve do + = raw file.colorize(options: { linenos: 'True'}) + - else + %h3 + %center Empty file - elsif file.image? .view_file_content_image %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} |