Skip to content
Snippets Groups Projects
Commit 3c97cbc7 authored by Valery Sizov's avatar Valery Sizov
Browse files

fixes after review

parent 5df2c441
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -135,7 +135,7 @@ class Commit
description.present?
end
 
def hook_attrs(with_changed_files = false)
def hook_attrs(with_changed_files: false)
path_with_namespace = project.path_with_namespace
 
data = {
Loading
Loading
@@ -150,11 +150,7 @@ class Commit
}
 
if with_changed_files
data.merge!({
added: repo_changes[:added],
modified: repo_changes[:modified],
removed: repo_changes[:removed]
})
data.merge!(repo_changes)
end
 
data
Loading
Loading
@@ -212,16 +208,13 @@ class Commit
def repo_changes
changes = { added: [], modified: [], removed: [] }
 
if diffs.any?
diffs.each do |diff|
case true
when diff.deleted_file
changes[:removed] << diff.old_path
when diff.renamed_file, diff.new_file
changes[:added] << diff.new_path
else
changes[:modified] << diff.new_path
end
diffs.each do |diff|
if diff.deleted_file
changes[:removed] << diff.old_path
elsif diff.renamed_file || diff.new_file
changes[:added] << diff.new_path
else
changes[:modified] << diff.new_path
end
end
 
Loading
Loading
Loading
Loading
@@ -31,7 +31,7 @@ module Gitlab
# For performance purposes maximum 20 latest commits
# will be passed as post receive hook data.
commit_attrs = commits_limited.map do |commit|
commit.hook_attrs(true)
commit.hook_attrs(with_changed_files: true)
end
 
type = Gitlab::Git.tag_ref?(ref) ? "tag_push" : "push"
Loading
Loading
Loading
Loading
@@ -102,7 +102,7 @@ eos
end
 
describe '#hook_attrs' do
let(:data) { commit.hook_attrs(true) }
let(:data) { commit.hook_attrs(with_changed_files: true) }
 
it { expect(data).to be_a(Hash) }
it { expect(data[:message]).to include('Add submodule from gitlab.com') }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment