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

Revert "[refs #90] more security" 

This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
This commit is contained in:
Alexander Machehin 2012-04-20 21:17:43 +06:00
parent 1b93244f7b
commit 61a27bbb7d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/pull_request.rb
View File

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