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

Context refactoring. Move Issues list, Search logic to context

Browse source
This commit is contained in:
randx 2012-10-09 22:09:46 +03:00
parent 63fe042d97
commit 679d0d6d76
15 changed files with 100 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/merge_requests_controller.rb
View file

@ -18,7 +18,7 @@ class MergeRequestsController < ProjectResourceController
def index
@merge_requests = MergeRequestsLoad.new(project, current_user, params).execute
@merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute
end
def show
@ -55,7 +55,7 @@ class MergeRequestsController < ProjectResourceController
@merge_request.reload_code
redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.'
else
render action: "new"
render action: "new"
end
end
@ -70,7 +70,7 @@ class MergeRequestsController < ProjectResourceController
end
def automerge_check
if @merge_request.unchecked?
if @merge_request.unchecked?
@merge_request.check_if_can_be_merged
end
render json: {state: @merge_request.human_state}
@ -125,7 +125,7 @@ class MergeRequestsController < ProjectResourceController
def validates_merge_request
# Show git not found page if target branch doesnt exist
return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
# Show git not found page if source branch doesnt exist
# and there is no saved commits between source & target branch
@ -136,7 +136,7 @@ class MergeRequestsController < ProjectResourceController
# Build a note object for comment form
@note = @project.notes.new(noteable: @merge_request)
# Get commits from repository
# Get commits from repository
# or from cache if already merged
@commits = @merge_request.commits
@commits = CommitDecorator.decorate(@commits)