Commit 8c46123f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

fixed merge request diffissues 355, 351

parent fde29a82
......@@ -89,6 +89,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
float:left;
width:35px;
font-weight:normal;
color:#888;
&:hover {
text-decoration:underline;
}
......@@ -139,8 +140,6 @@ ul.bordered-list {
ul.bordered-list li:last-child { border:none }
.line_holder {
cursor:pointer;
&:hover {
td {
background: #FFFFCF !important;
......
......@@ -45,6 +45,7 @@ class MergeRequestsController < ApplicationController
def diffs
@diffs = @merge_request.diffs
@commit = @merge_request.last_commit
@line_notes = []
end
def new
......
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