Commit 8c46123f9902cfb173e0bdc80c3e111eba1b1841
1 parent
fde29a82
Exists in
master
and in
4 other branches
fixed merge request diffissues 355, 351
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
app/assets/stylesheets/commits.css.scss
| @@ -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{ | ||
| 89 | float:left; | 89 | float:left; |
| 90 | width:35px; | 90 | width:35px; |
| 91 | font-weight:normal; | 91 | font-weight:normal; |
| 92 | + color:#888; | ||
| 92 | &:hover { | 93 | &:hover { |
| 93 | text-decoration:underline; | 94 | text-decoration:underline; |
| 94 | } | 95 | } |
| @@ -139,8 +140,6 @@ ul.bordered-list { | @@ -139,8 +140,6 @@ ul.bordered-list { | ||
| 139 | ul.bordered-list li:last-child { border:none } | 140 | ul.bordered-list li:last-child { border:none } |
| 140 | 141 | ||
| 141 | .line_holder { | 142 | .line_holder { |
| 142 | - cursor:pointer; | ||
| 143 | - | ||
| 144 | &:hover { | 143 | &:hover { |
| 145 | td { | 144 | td { |
| 146 | background: #FFFFCF !important; | 145 | background: #FFFFCF !important; |
app/controllers/merge_requests_controller.rb
| @@ -45,6 +45,7 @@ class MergeRequestsController < ApplicationController | @@ -45,6 +45,7 @@ class MergeRequestsController < ApplicationController | ||
| 45 | def diffs | 45 | def diffs |
| 46 | @diffs = @merge_request.diffs | 46 | @diffs = @merge_request.diffs |
| 47 | @commit = @merge_request.last_commit | 47 | @commit = @merge_request.last_commit |
| 48 | + @line_notes = [] | ||
| 48 | end | 49 | end |
| 49 | 50 | ||
| 50 | def new | 51 | def new |