Download as
Browse Code »

Commit aee28088f8eb64f886b65be55ea7a457943aadc5

Authored by Dmitriy Zaporozhets
2 parents 1f9b3f2e f248e4f5
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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

Showing 3 changed files with 2 additions and 7 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @aee2808
... ... @@ -36,6 +36,7 @@ v 6.6.0
36 36 - Restyle Issue#show page and MR#show page
37 37 - Ability to filter by multiple labels for Issues page
38 38 - Rails version to 4.0.3
  39 + - Fixed attachment identifier displaying underneath note text (Jason Blanchard)
39 40  
40 41 v 6.5.1
41 42 - Fix branch selectbox when create merge request from fork
... ...
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @aee2808
... ... @@ -87,7 +87,6 @@ ul.notes {
87 87 }
88 88 .attachment {
89 89 font-size: 14px;
90   - margin-top: -20px;
91 90 }
92 91 .note-body {
93 92 @include md-typography;
... ... @@ -305,6 +304,7 @@ ul.notes {
305 304 @extend .col-md-4;
306 305 @extend .thumbnail;
307 306 margin-left: 45px;
  307 + float: none;
308 308 }
309 309  
310 310  
... ...
app/models/merge_request_diff.rb
  Diff comments   View file @aee2808
... ... @@ -69,12 +69,6 @@ class MergeRequestDiff < ActiveRecord::Base
69 69 end
70 70 end
71 71  
72   - # When Git::Diff is not able to get diff
73   - # because of git timeout it return this value
74   - def broken_diffs
75   - [Gitlab::Git::Diff::BROKEN_DIFF]
76   - end
77   -
78 72 # Collect array of Git::Commit objects
79 73 # between target and source branches
80 74 def unmerged_commits
... ...