Merge branch 'master' of github.com:gitlabhq/gitlabhq

CHANGELOG

@@ -36,6 +36,7 @@ v 6.6.0
   - Restyle Issue#show page and MR#show page
   - Ability to filter by multiple labels for Issues page
   - Rails version to 4.0.3
+  - Fixed attachment identifier displaying underneath note text (Jason Blanchard)
 v 6.5.1
   - Fix branch selectbox when create merge request from fork

app/assets/stylesheets/sections/notes.scss

@@ -87,7 +87,6 @@ ul.notes {
     }
     .attachment {
       font-size: 14px;
-      margin-top: -20px;
     }
     .note-body {
       @include md-typography;
@@ -305,6 +304,7 @@ ul.notes {
   @extend .col-md-4;
   @extend .thumbnail;
   margin-left: 45px;
+  float: none;
 }

app/models/merge_request_diff.rb

@@ -69,12 +69,6 @@ class MergeRequestDiff < ActiveRecord::Base
     end
   end
-  # When Git::Diff is not able to get diff
-  # because of git timeout it return this value
-  def broken_diffs
-    [Gitlab::Git::Diff::BROKEN_DIFF]
-  end
-
   # Collect array of Git::Commit objects
   # between target and source branches
   def unmerged_commits