mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-19 01:26:08 +10:00
Adds JSON callback, which is currently not working.
This commit is contained in:
committed by
Phil Hughes
parent
91880e13df
commit
51ceb3802f
@@ -33,15 +33,13 @@ class @MergeRequestWidget
|
||||
|
||||
getBuildStatus: ->
|
||||
urlToCiCheck = @opts.url_to_ci_check
|
||||
ciEnabled = @opts.ci_enable
|
||||
console.log(ciEnabled)
|
||||
console.log('checking')
|
||||
setInterval (->
|
||||
if ciEnabled
|
||||
$.getJSON urlToCiCheck, (data) ->
|
||||
console.log("data",data);
|
||||
return
|
||||
$.getJSON urlToCiCheck, (data) ->
|
||||
console.log("data",data);
|
||||
return
|
||||
), 5000
|
||||
return
|
||||
), 5000
|
||||
|
||||
getCiStatus: ->
|
||||
$.get @opts.url_to_ci_check, (data) =>
|
||||
|
||||
@@ -218,6 +218,14 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
||||
end
|
||||
end
|
||||
|
||||
def st
|
||||
@ci_commit = @merge_request.ci_commit
|
||||
@statuses = @ci_commit.statuses if @ci_commit
|
||||
render json: {
|
||||
statuses: @statuses
|
||||
}
|
||||
end
|
||||
|
||||
def ci_status
|
||||
ci_service = @merge_request.source_project.ci_service
|
||||
status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch)
|
||||
@@ -228,8 +236,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
||||
|
||||
response = {
|
||||
status: status,
|
||||
coverage: coverage,
|
||||
ci_status: @merge_request.ci_commit.status
|
||||
coverage: coverage
|
||||
}
|
||||
|
||||
render json: response
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
merge_request_widget = new MergeRequestWidget({
|
||||
url_to_automerge_check: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
|
||||
check_enable: #{@merge_request.unchecked? ? "true" : "false"},
|
||||
url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
|
||||
url_to_ci_check: "#{st_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
|
||||
ci_enable: #{@project.ci_service ? "true" : "false"},
|
||||
current_status: "#{@merge_request.gitlab_merge_status}"
|
||||
});
|
||||
|
||||
@@ -620,6 +620,7 @@ Rails.application.routes.draw do
|
||||
post :merge
|
||||
post :cancel_merge_when_build_succeeds
|
||||
get :ci_status
|
||||
get :st
|
||||
post :toggle_subscription
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user