Commit f96dc629 authored by Douwe Maan's avatar Douwe Maan

Everything from gitlab_git is already UTF-8.

parent 606d24ff
...@@ -28,8 +28,8 @@ class Projects::GraphsController < Projects::ApplicationController ...@@ -28,8 +28,8 @@ class Projects::GraphsController < Projects::ApplicationController
@commits.each do |commit| @commits.each do |commit|
@log << { @log << {
author_name: commit.author_name.force_encoding('UTF-8'), author_name: commit.author_name,
author_email: commit.author_email.force_encoding('UTF-8'), author_email: commit.author_email,
date: commit.committed_date.strftime("%Y-%m-%d") date: commit.committed_date.strftime("%Y-%m-%d")
} }
end end
......
...@@ -136,8 +136,8 @@ class Repository ...@@ -136,8 +136,8 @@ class Repository
commit = Gitlab::Git::Commit.new(rugged_commit) commit = Gitlab::Git::Commit.new(rugged_commit)
{ {
author_name: commit.author_name.force_encoding('UTF-8'), author_name: commit.author_name,
author_email: commit.author_email.force_encoding('UTF-8'), author_email: commit.author_email,
additions: commit.stats.additions, additions: commit.stats.additions,
deletions: commit.stats.deletions, deletions: commit.stats.deletions,
} }
......
...@@ -30,5 +30,5 @@ ...@@ -30,5 +30,5 @@
%code %code
:erb :erb
<% lines.each do |line| %> <% lines.each do |line| %>
<%= highlight(@blob.name, line.force_encoding("utf-8"), true).html_safe %> <%= highlight(@blob.name, line, true).html_safe %>
<% 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