deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix decorate calls on collections after draper update

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-01 15:24:59 +02:00
parent 520f02259c
commit 6aead7991f
6 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/merge_requests_controller.rb
View file

@ -94,12 +94,12 @@ class MergeRequestsController < ProjectResourceController
def branch_from
@commit = @repository.commit(params[:ref])
@commit = CommitDecorator.decorate(@commit)
@commit = CommitDecorator.decorate_collection(@commit)
end
def branch_to
@commit = @repository.commit(params[:ref])
@commit = CommitDecorator.decorate(@commit)
@commit = CommitDecorator.decorate_collection(@commit)
end
def ci_status
@ -143,7 +143,7 @@ class MergeRequestsController < ProjectResourceController
# Get commits from repository
# or from cache if already merged
@commits = @merge_request.commits
@commits = CommitDecorator.decorate(@commits)
@commits = CommitDecorator.decorate_collection(@commits)
@allowed_to_merge = allowed_to_merge?
@show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge