kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

removing ci_enable

This commit is contained in:
Jacob Schatz 2016-03-03 20:25:42 -05:00 committed by Phil Hughes
parent fcc0f7c68e
commit 00deaaafb1
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/merge_request_widget.js.coffee
View File

@ -4,7 +4,6 @@ class @MergeRequestWidget
# check_enable - Boolean, whether to check automerge status
# url_to_automerge_check - String, URL to use to check 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
#
constructor: (@opts) ->

3
app/views/projects/merge_requests/widget/_show.html.haml
View File

@ -13,8 +13,7 @@
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)}",
gitlab_icon: "#{asset_path 'gitlab_logo.png'}",
ci_enable: #{@project.ci_service ? "true" : "false"}
gitlab_icon: "#{asset_path 'gitlab_logo.png'}"
};
- if @merge_request.ci_commit