Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OHR Support
Manage
Activity
Members
Labels
Plan
Issues
97
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
OHR Support
Commits
9f2c412f
Commit
9f2c412f
authored
13 years ago
by
Eric Davis
Browse files
Options
Downloads
Patches
Plain Diff
[#383] Fix for undefined_method 'to_utf8'
Contributed by Artem Naluzhnyy
parent
7c751b35
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/views/common/_diff.rhtml
+3
-3
3 additions, 3 deletions
app/views/common/_diff.rhtml
with
3 additions
and
3 deletions
app/views/common/_diff.rhtml
+
3
−
3
View file @
9f2c412f
...
...
@@ -5,7 +5,7 @@
<%
if
diff
.
diff_type
==
'sbs'
-%>
<table
class=
"filecontent"
>
<thead>
<tr><th
colspan=
"4"
class=
"filename"
>
<%=
to_utf8
table_file
.
file_name
%>
</th></tr>
<tr><th
colspan=
"4"
class=
"filename"
>
<%=
to_utf8
_for_attachments
table_file
.
file_name
%>
</th></tr>
</thead>
<tbody>
<%
table_file
.
each_line
do
|
spacing
,
line
|
-%>
...
...
@@ -17,11 +17,11 @@
<tr>
<th
class=
"line-num"
>
<%=
line
.
nb_line_left
%>
</th>
<td
class=
"line-code
<%=
line
.
type_diff_left
%>
"
>
<pre>
<%=
to_utf8
line
.
html_line_left
%>
</pre>
<pre>
<%=
to_utf8
_for_attachments
line
.
html_line_left
%>
</pre>
</td>
<th
class=
"line-num"
>
<%=
line
.
nb_line_right
%>
</th>
<td
class=
"line-code
<%=
line
.
type_diff_right
%>
"
>
<pre>
<%=
to_utf8
line
.
html_line_right
%>
</pre>
<pre>
<%=
to_utf8
_for_attachments
line
.
html_line_right
%>
</pre>
</td>
</tr>
<%
end
-%>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment