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

Merge branch '90-pull' of github.com:warpc/rosa-build into 90-pull 

Conflicts:
	app/models/project.rb
	app/models/pull_request.rb
	db/migrate/20120412173938_create_pull_requests.rb
	db/schema.rb
	spec/models/pull_request_spec.rb
This commit is contained in:
Alexander Machehin 2012-04-28 23:42:34 +06:00
parent 4ad39b05c0 25bd2a6e77
commit 30ac14a413
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/pull_request.rb
View File

@ -128,6 +128,4 @@ class PullRequest < ActiveRecord::Base
end end
# TODO catch errors # TODO catch errors
end end
end end

1
spec/models/pull_request_spec.rb
View File

@ -91,5 +91,4 @@ describe PullRequest do
FileUtils.rm_rf(APP_CONFIG['root_path']) FileUtils.rm_rf(APP_CONFIG['root_path'])
#~ FileUtils.rm_rf File.join(Rails.root, "tmp", Rails.env, "pull_requests") #~ FileUtils.rm_rf File.join(Rails.root, "tmp", Rails.env, "pull_requests")
end end
end end