3022786948
Conflicts: app/assets/stylesheets/sections/notes.scss app/contexts/notes/load_context.rb app/models/project.rb app/observers/note_observer.rb app/roles/votes.rb app/views/commit/show.html.haml app/views/merge_requests/_show.html.haml app/views/merge_requests/diffs.js.haml app/views/merge_requests/show.js.haml app/views/notes/_note.html.haml features/steps/project/project_merge_requests.rb spec/models/note_spec.rb
29 lines
955 B
Text
29 lines
955 B
Text
= render "commits/commit_box"
|
|
|
|
%p.right.cgray
|
|
This commit has
|
|
%span.cgreen #{@commit.stats.additions} additions
|
|
and
|
|
%span.cred #{@commit.stats.deletions} deletions
|
|
|
|
= render "commits/diffs", diffs: @commit.diffs
|
|
= render "notes/notes_with_form"
|
|
|
|
:javascript
|
|
$(function(){
|
|
var w, h;
|
|
$('.diff_file').each(function(){
|
|
$('.image.diff_removed img', this).on('load', $.proxy(function(event){
|
|
var w = event.currentTarget.naturalWidth
|
|
, h = event.currentTarget.naturalHeight;
|
|
$('.image.diff_removed .image-info', this).append(' | <b>W:</b> ' + w + 'px | <b>H:</b> ' + h + 'px');
|
|
}, this));
|
|
$('.image.diff_added img', this).on('load', $.proxy(function(event){
|
|
var w = event.currentTarget.naturalWidth
|
|
, h = event.currentTarget.naturalHeight;
|
|
$('.image.diff_added .image-info', this).append(' | <b>W:</b> ' + w + 'px | <b>H:</b> ' + h + 'px');
|
|
}, this));
|
|
|
|
});
|
|
|
|
});
|