diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-03 20:25:42 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 10:26:48 +0000 |
| commit | 00deaaafb1149d78a019d96b02ca2e6279d39f25 (patch) | |
| tree | c9b6035c70a62b8f85d18276f7e4e136a14a4fe9 | |
| parent | fcc0f7c68ecdb17c3ee6173515663a7c2854f44c (diff) | |
| download | gitlab-ce-00deaaafb1149d78a019d96b02ca2e6279d39f25.tar.gz | |
removing ci_enable
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_show.html.haml | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index 97198e14248..27537d72661 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -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) -> diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml index dbc6d6c3f90..9537eda5aa5 100644 --- a/app/views/projects/merge_requests/widget/_show.html.haml +++ b/app/views/projects/merge_requests/widget/_show.html.haml @@ -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 |