Merge branch 'dev' into new_layout

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

app/assets/stylesheets/projects.css.scss

@@ -364,7 +364,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
   text-shadow: #555 1px 1px;
 }
 
-/** FALSH **/
+/** FLASH **/
 
 #flash_container {
   height:40px;
@@ -636,9 +636,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
 }
 
 .top_panel_issues{
-  #issue_search_form { 
-    margin:5px 0; 
-    input { 
+  #issue_search_form {
+    margin:5px 0;
+    input {
       border:1px solid #D3D3D3;
       padding: 3px;
       height: 28px;
@@ -647,7 +647,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
       box-sizing: border-box;
       -moz-box-sizing: border-box;
 
-      &:focus { 
+      &:focus {
         border-color:#c2e1ef;
       }
     }
@@ -672,4 +672,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
 }
 .width-65p{
   width:65%;
+pre.commit_message {
+  white-space: pre-wrap;
 }

app/controllers/issues_controller.rb

@@ -42,7 +42,7 @@ class IssuesController < ApplicationController
   def create
     @issue = @project.issues.new(params[:issue])
     @issue.author = current_user
-    if @issue.save
+    if @issue.save && @issue.assignee != current_user
       Notify.new_issue_email(@issue).deliver
     end
 

app/views/commits/show.html.haml

@@ -16,7 +16,9 @@
     %td= @commit.committed_date
   %tr
     %td Message
-    %td= @commit.safe_message
+    %td
+      %pre.commit_message
+        = preserve @commit.safe_message
   %tr
     %td Tree
     %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id)