Commit 4df4b381 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 5bc97fbd 7b7549be
...@@ -477,6 +477,17 @@ body.project-page table.no-borders td{ ...@@ -477,6 +477,17 @@ body.project-page table.no-borders td{
#tree-content-holder { float:left; width:100%; } #tree-content-holder { float:left; width:100%; }
#tree-readme-holder {
float:left;
width:100%;
.readme {
@include round-borders-all(4px);
padding: 4px 15px;
background:#F7F7F7;
}
}
/* Commit Page */ /* Commit Page */
......
require 'digest/md5' require 'digest/md5'
module ApplicationHelper module ApplicationHelper
include Utils::CharEncode
def gravatar_icon(user_email) def gravatar_icon(user_email)
gravatar_host = request.ssl? ? "https://secure.gravatar.com" : "http://www.gravatar.com" gravatar_host = request.ssl? ? "https://secure.gravatar.com" : "http://www.gravatar.com"
......
module CommitsHelper module CommitsHelper
include Utils::CharEncode
def old_line_number(line, i) def old_line_number(line, i)
end end
......
...@@ -35,6 +35,12 @@ ...@@ -35,6 +35,12 @@
- contents.select{ |i| i.is_a?(Grit::Blob)}.each do |content| - contents.select{ |i| i.is_a?(Grit::Blob)}.each do |content|
= render :partial => "refs/tree_item", :locals => { :content => content } = render :partial => "refs/tree_item", :locals => { :content => content }
- if content = contents.select{ |c| c.is_a?(Grit::Blob) and c.name =~ /^readme\.(md|markdown)$/i }.first
#tree-readme-holder
%h3= content.name
.readme
= markdown(encode content.data)
:javascript :javascript
$(function(){ $(function(){
$('select#branch').selectmenu({style:'popup', width:200}); $('select#branch').selectmenu({style:'popup', width:200});
......
...@@ -18,13 +18,14 @@ module Utils ...@@ -18,13 +18,14 @@ module Utils
module CharEncode module CharEncode
def encode(string) def encode(string)
return '' unless string
cd = CharDet.detect(string) cd = CharDet.detect(string)
if cd.confidence > 0.6 if cd.confidence > 0.6
string.force_encoding(cd.encoding) string.force_encoding(cd.encoding)
end end
string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace) string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace)
rescue rescue
"Invalid code encoding" "Invalid Encoding"
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment