Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[refs #90] more security

This commit is contained in:
Alexander Machehin 2012-04-20 17:08:49 +06:00
parent b1365fc567
commit aa83c14165
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/pull_request.rb
View File

@ -47,7 +47,8 @@ class PullRequest < Issue
def merge!(who) def merge!(who)
return false unless can_merge? return false unless can_merge?
Dir.chdir(path) do Dir.chdir(path) do
system "git config user.name \"#{who.uname}\" && git config user.email \"#{who.email}\"" system 'git config user.name', '\"#{who.uname}\"'
system 'git config user.email', '\"#{who.email}\"'
if merge if merge
merging merging
system("git push origin HEAD") system("git push origin HEAD")
@ -68,7 +69,10 @@ class PullRequest < Issue
def merge def merge
clone clone
system("cd #{path} && git checkout #{data[:base_branch]} && git merge --no-ff #{data[:head_branch]}") Dir.chdir(path) do
system 'git checkout', data[:base_branch]
system 'git merge', '--no-ff', data[:head_branch]
end
end end
def clone def clone
@ -80,7 +84,8 @@ class PullRequest < Issue
end end
Dir.chdir(path) do Dir.chdir(path) do
[data[:base_branch], data[:head_branch]].each do |branch| [data[:base_branch], data[:head_branch]].each do |branch|
system "git checkout #{branch} && git pull origin #{branch}" system 'git checkout', branch
system 'git pull origin', branch
end end
end end
# TODO catch errors # TODO catch errors