Commit 00deaaaf authored by Jacob Schatz's avatar Jacob Schatz Committed by Phil Hughes

removing ci_enable

parent fcc0f7c6
...@@ -4,7 +4,6 @@ class @MergeRequestWidget ...@@ -4,7 +4,6 @@ class @MergeRequestWidget
# check_enable - Boolean, whether to check automerge status # check_enable - Boolean, whether to check automerge status
# url_to_automerge_check - String, URL to use to check automerge status # url_to_automerge_check - String, URL to use to check automerge status
# current_status - String, current automerge status # current_status - String, current automerge status
# ci_enable - Boolean, whether a CI service is enabled
# url_to_ci_check - String, URL to use to check CI status # url_to_ci_check - String, URL to use to check CI status
# #
constructor: (@opts) -> constructor: (@opts) ->
......
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
url_to_automerge_check: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}", url_to_automerge_check: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
check_enable: #{@merge_request.unchecked? ? "true" : "false"}, 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: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
gitlab_icon: "#{asset_path 'gitlab_logo.png'}", gitlab_icon: "#{asset_path 'gitlab_logo.png'}"
ci_enable: #{@project.ci_service ? "true" : "false"}
}; };
- if @merge_request.ci_commit - if @merge_request.ci_commit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment