deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed merge request diffissues 355, 351

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-01-20 09:49:48 +02:00
parent fde29a82e6
commit 8c46123f99
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/commits.css.scss
View file

@ -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 {
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;

1
app/controllers/merge_requests_controller.rb
View file

@ -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