diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-01-20 11:49:48 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-01-20 11:49:48 +0400 |
| commit | 8c46123f9902cfb173e0bdc80c3e111eba1b1841 (patch) | |
| tree | 21c96c94983367717e02a4c5e4520d3800dc5203 /app | |
| parent | fde29a82e66e106ad71b83401ef91bbef0a25082 (diff) | |
fixed merge request diffissues 355, 351
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/commits.css.scss | 3 | ||||
| -rw-r--r-- | app/controllers/merge_requests_controller.rb | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss index eab3315ac5b..90e3b9019d9 100644 --- a/app/assets/stylesheets/commits.css.scss +++ b/app/assets/stylesheets/commits.css.scss @@ -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; diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 6a1404106ea..6f7f1f6a7c7 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -45,6 +45,7 @@ class MergeRequestsController < ApplicationController def diffs @diffs = @merge_request.diffs @commit = @merge_request.last_commit + @line_notes = [] end def new |