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

Improve CI integration for merge requests

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-11 06:14:05 +03:00
parent c92726e6c8
commit ca936d2784
10 changed files with 83 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/merge_requests_controller.rb
View file

@ -1,6 +1,6 @@
class MergeRequestsController < ProjectResourceController
before_filter :module_enabled
before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check]
before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]
before_filter :validates_merge_request, only: [:show, :diffs]
before_filter :define_show_vars, only: [:show, :diffs]
@ -103,6 +103,13 @@ class MergeRequestsController < ProjectResourceController
@commit = CommitDecorator.decorate(@commit)
end
def ci_status
status = project.gitlab_ci_service.commit_status(merge_request.last_commit.sha)
response = { status: status }
render json: response
end
protected
def merge_request