From 29d400ba0d67b282144e04610ab23f45b21fcc41 Mon Sep 17 00:00:00 2001 From: Jason Blanchard Date: Wed, 19 Feb 2014 20:32:42 -0500 Subject: [PATCH 1/2] Fixed attachment identifier displaying underneath note text --- CHANGELOG | 1 + app/assets/stylesheets/sections/notes.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 5f42f851b0..6326538952 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,6 +21,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 diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 9f5f1579fb..e6eabf4745 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -87,7 +87,6 @@ ul.notes { } .attachment { font-size: 14px; - margin-top: -20px; } .note-body { @include md-typography; @@ -302,6 +301,7 @@ ul.notes { @extend .col-md-4; @extend .thumbnail; margin-left: 45px; + float: none; } From 5c3972ae1e2c40959b7a2da75b78396a09aacb5c Mon Sep 17 00:00:00 2001 From: tsl0922 Date: Thu, 27 Feb 2014 14:58:27 +0800 Subject: [PATCH 2/2] remove dead code: broken_diffs --- app/models/merge_request_diff.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index a226fef734..99afffc1db 100644 --- a/app/models/merge_request_diff.rb +++ b/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