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

[refs #90] new/show actions refactoring

This commit is contained in:
Alexander Machehin 2012-05-31 17:23:30 +06:00
parent 3c3448e26f
commit ca72504ca2
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,14 +24,7 @@ class Projects::PullRequestsController < Projects::BaseController
if @pull.status == 'already'
flash[:warning] = I18n.t('projects.pull_requests.up_to_date', :base_ref => @pull.base_ref, :head_ref => @pull.head_ref)
else
repo = Git::Repository.new(@pull.path)
@base_commit = repo.commits(@pull.base_ref).first
@head_commit = repo.commits(@pull.head_branch).first
repo = Grit::Repo.new(@pull.path)
@diff = repo.diff @base_commit, @head_commit
@stats = @pull.diff_stats
@commits = repo.commits_between @base_commit, @head_commit
load_diff_commits_data
end
end
@ -70,14 +63,7 @@ class Projects::PullRequestsController < Projects::BaseController
end
def show
repo = Git::Repository.new(@pull.path)
@base_commit = repo.commits(@pull.base_ref).first
@head_commit = repo.commits(@pull.head_branch).first
repo = Grit::Repo.new(@pull.path)
@diff = repo.diff @base_commit, @head_commit
@stats = @pull.diff_stats
@commits = repo.commits_between @base_commit, @head_commit
load_diff_commits_data
end
def autocomplete_base_project_name
@ -118,4 +104,14 @@ class Projects::PullRequestsController < Projects::BaseController
@pull_requests = @project.pull_requests
end
end
def load_diff_commits_data
repo = Grit::Repo.new(@pull.path)
@base_commit = repo.commits(@pull.base_ref).first
@head_commit = repo.commits(@pull.head_branch).first
@diff = repo.diff @base_commit, @head_commit
@stats = @pull.diff_stats
@commits = repo.commits_between @base_commit, @head_commit
end
end