Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
f96dc629
Commit
f96dc629
authored
9 years ago
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Everything from gitlab_git is already UTF-8.
parent
606d24ff
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/controllers/projects/graphs_controller.rb
app/controllers/projects/graphs_controller.rb
+2
-2
app/models/repository.rb
app/models/repository.rb
+2
-2
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+1
-1
No files found.
app/controllers/projects/graphs_controller.rb
View file @
f96dc629
...
...
@@ -28,8 +28,8 @@ class Projects::GraphsController < Projects::ApplicationController
@commits
.
each
do
|
commit
|
@log
<<
{
author_name:
commit
.
author_name
.
force_encoding
(
'UTF-8'
)
,
author_email:
commit
.
author_email
.
force_encoding
(
'UTF-8'
)
,
author_name:
commit
.
author_name
,
author_email:
commit
.
author_email
,
date:
commit
.
committed_date
.
strftime
(
"%Y-%m-%d"
)
}
end
...
...
This diff is collapsed.
Click to expand it.
app/models/repository.rb
View file @
f96dc629
...
...
@@ -136,8 +136,8 @@ class Repository
commit
=
Gitlab
::
Git
::
Commit
.
new
(
rugged_commit
)
{
author_name:
commit
.
author_name
.
force_encoding
(
'UTF-8'
)
,
author_email:
commit
.
author_email
.
force_encoding
(
'UTF-8'
)
,
author_name:
commit
.
author_name
,
author_email:
commit
.
author_email
,
additions:
commit
.
stats
.
additions
,
deletions:
commit
.
stats
.
deletions
,
}
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/blame/show.html.haml
View file @
f96dc629
...
...
@@ -30,5 +30,5 @@
%code
:erb
<%
lines
.
each
do
|
line
|
%>
<%=
highlight
(
@blob
.
name
,
line
.
force_encoding
(
"utf-8"
)
,
true
).
html_safe
%>
<%=
highlight
(
@blob
.
name
,
line
,
true
).
html_safe
%>
<%
end
%>
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment