fixed merge request diffissues 355, 351

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