diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-20 18:54:06 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 10:26:48 +0000 |
| commit | 91880e13df19ed312bfa0a2e06743dd8a71aa1ad (patch) | |
| tree | 6796d167cf557a44d2c3eb0c24032040eb53446b | |
| parent | fde975facc37c7d2f7ea5c997624bc7c0f5759a8 (diff) | |
| download | gitlab-ce-91880e13df19ed312bfa0a2e06743dd8a71aa1ad.tar.gz | |
initial ajax build
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 24 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_show.html.haml | 3 |
3 files changed, 22 insertions, 8 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 738ffc8343b..98f200f9b8a 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -9,6 +9,7 @@ class @MergeRequestWidget # constructor: (@opts) -> modal = $('#modal_merge_info').modal(show: false) + @getBuildStatus() mergeInProgress: (deleteSourceBranch = false)-> $.ajax @@ -30,13 +31,24 @@ class @MergeRequestWidget $.get @opts.url_to_automerge_check, (data) -> $('.mr-state-widget').replaceWith(data) + getBuildStatus: -> + urlToCiCheck = @opts.url_to_ci_check + ciEnabled = @opts.ci_enable + console.log(ciEnabled) + setInterval (-> + if ciEnabled + $.getJSON urlToCiCheck, (data) -> + console.log("data",data); + return + return + ), 5000 + getCiStatus: -> - if @opts.ci_enable - $.get @opts.url_to_ci_check, (data) => - this.showCiState data.status - if data.coverage - this.showCiCoverage data.coverage - , 'json' + $.get @opts.url_to_ci_check, (data) => + this.showCiState data.status + if data.coverage + this.showCiCoverage data.coverage + , 'json' showCiState: (state) -> $('.ci_widget').hide() diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 61b82c9db46..861ae7ee2f7 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -228,7 +228,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController response = { status: status, - coverage: coverage + coverage: coverage, + ci_status: @merge_request.ci_commit.status } render json: response diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index a489d4f9b24..a86677c23ad 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -15,6 +15,7 @@ check_enable: #{@merge_request.unchecked? ? "true" : "false"}, url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}", ci_enable: #{@project.ci_service ? "true" : "false"}, - current_status: "#{@merge_request.gitlab_merge_status}", + current_status: "#{@merge_request.gitlab_merge_status}" }); + var cici = "#{@project}" |