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