diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2011-12-30 23:20:16 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2011-12-30 23:20:16 +0200 |
| commit | d34904b86c07f6a408bbd4496ea23a23f1208ec5 (patch) | |
| tree | 89efb2d01d3ecc65c1b67322d002bf3a894b80a4 /app | |
| parent | e33aab0b21e38f4cf7aed8bb6451d737fcefe110 (diff) | |
| parent | 31f3d6efb3b4b3f4ae5ffd64455cc2e26106a61d (diff) | |
| download | gitlab-ce-d34904b86c07f6a408bbd4496ea23a23f1208ec5.tar.gz | |
Merge branch 'grit_ext'
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 1 | ||||
| -rw-r--r-- | app/models/commit.rb | 7 | ||||
| -rw-r--r-- | app/views/commits/_text_file.html.haml | 2 | ||||
| -rw-r--r-- | app/views/refs/_tree.html.haml | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4b00c9ab7e2..99ef30aef51 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,6 +1,5 @@ require 'digest/md5' module ApplicationHelper - include Utils::CharEncode def gravatar_icon(user_email, size = 40) gravatar_host = request.ssl? ? "https://secure.gravatar.com" : "http://www.gravatar.com" diff --git a/app/models/commit.rb b/app/models/commit.rb index c97aec28c72..33d3b202ee7 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -1,5 +1,4 @@ class Commit - include Utils::CharEncode attr_accessor :commit attr_accessor :head @@ -22,7 +21,7 @@ class Commit end def safe_message - encode(message) + message end def created_at @@ -30,11 +29,11 @@ class Commit end def author_email - encode(author.email) + author.email end def author_name - encode(author.name) + author.name end def prev_commit diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml index 22fe5582dfd..954722b1f31 100644 --- a/app/views/commits/_text_file.html.haml +++ b/app/views/commits/_text_file.html.haml @@ -1,7 +1,7 @@ %table - line_old = 0 - line_new = 0 - - diff_str = encode(diff.diff) + - diff_str = diff.diff - lines_arr = diff_str.lines.to_a - lines_arr.each do |line| - next if line.match(/^--- \/dev\/null/) diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml index 07bab2129dc..b7b3fd2ca80 100644 --- a/app/views/refs/_tree.html.haml +++ b/app/views/refs/_tree.html.haml @@ -40,9 +40,9 @@ %h3= content.name .readme - if content.name =~ /\.(md|markdown)$/i - = markdown(encode content.data) + = markdown(content.data) - else - = simple_format(encode content.data) + = simple_format(content.data) :javascript $(function(){ |