Merge branch 'per_line_comment'

Conflicts:
	app/assets/stylesheets/projects.css.scss

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/assets/stylesheets/projects.css.scss
index 22e8f99,bb94282..be696d9
--- 1/app/assets/stylesheets/projects.css.scss
--- 2/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@@ -694,35 -694,30 +694,63 @@@ a.project-update.titled 
    }
  }
  
 +.add_new { 
 +  float:right;
 +  padding: 5px 12px;
 +  border: 1px solid #CCC;
 +
 +  &:hover { 
 +    background:#eee;
 +  }
 +
 +  &:active { 
 +    background:#ddd;
 +  }
 +}
 +
 +.tree_progress { 
 +  float:left;
 +  width:16px;
 +  height:16px;
 +  margin:6px;
 +  &.loading { 
 +    background-position: 0px 0px;
 +    background: url("ajax-loader-facebook.gif") no-repeat;
 +  }
 +}
 +
 +#tree-breadcrumbs { 
 +  h2 {
 +    margin:0;
 +    margin-bottom:20px;
 +    float:left;
 +  }
 +}
++
+ tr.line_notes_row { 
+   &:hover { 
+     background:none;
+   }
+   td { 
+     margin:0px;
+     padding:0px;
+     border-bottom:1px solid #DEE2E3;
+     
+ 
+     ul {
+       display:block;
+       list-style:none;
+       margin:0px;
+       padding:0px;
+ 
+       li { 
+         border-top:1px solid #DEE2E3;
+         padding:10px;
+ 
+         .delete-note { 
+           display:none; 
+         }
+       }
+     }
+   }
+ }

diff --cc app/views/commits/show.html.haml
index 44b7b8f,42f7263..3e847e7
--- 1/app/views/commits/show.html.haml
--- 2/app/views/commits/show.html.haml
+++ b/app/views/commits/show.html.haml
@@@ -24,3 -24,15 +24,15 @@@
  
  = render "commits/diff"
  = render "notes/notes"
 -    $(".line_content").live("click", function(e) { 
+ = render "notes/per_line_form"
+ 
+ 
+ :javascript
+   $(document).ready(function(){
++    $(".line_content").live("dblclick", function(e) { 
+       var form = $(".per_line_form");
+       $(this).parent().after(form);
+       form.find("#note_line_code").val($(this).attr("line_code"));
+       form.show();  
+     });
+   });