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

Merge pull request #676 from warpc/90-pull-fixes 

[refs #90] fix creating & updating pulls
This commit is contained in:
Vladimir Sharshov 2012-10-05 12:51:30 -07:00
parent 2d7f4de3b5 3513d47be6
commit 1bf0f07297
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects/pull_requests_controller.rb
View File

@ -47,7 +47,7 @@ class Projects::PullRequestsController < Projects::BaseController
flash.now[:error] = I18n.t('projects.pull_requests.up_to_date', :to_ref => @pull.to_ref, :from_ref => @pull.from_ref) flash.now[:error] = I18n.t('projects.pull_requests.up_to_date', :to_ref => @pull.to_ref, :from_ref => @pull.from_ref)
render :new render :new
else else
@pull.send(@pull.status) @pull.send(@pull.status == 'blocked' ? 'block' : @pull.status)
redirect_to project_pull_request_path(@pull.to_project, @pull) redirect_to project_pull_request_path(@pull.to_project, @pull)
end end
else else

2
app/models/activity_feed_observer.rb
View File

@ -71,7 +71,7 @@ class ActivityFeedObserver < ActiveRecord::Observer
when 'GitHook' when 'GitHook'
return unless record.project return unless record.project
record.project.pull_requests.needed_checking.each {|pull| pull.check} PullRequest.where("from_project_id = ? OR to_project_id = ?", record.project, record.project).needed_checking.each {|pull| pull.check}
change_type = record.change_type change_type = record.change_type
branch_name = record.refname.split('/').last branch_name = record.refname.split('/').last