diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-28 12:35:43 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-28 12:35:43 +0400 |
| commit | a18ae13e985d07fe9ef8288794778d31e2435696 (patch) | |
| tree | e3dc0105a27a0739618e140756756de95087ec42 /app/views | |
| parent | 49c50ee868cc355ae8d748ec67fce2e01311697f (diff) | |
Backport CI service refactoring from EE
It allows easier contribution of different CI services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_state_widget.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index cbb8c83e4d0..38a0ed567fc 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -40,7 +40,7 @@ url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}", check_enable: #{@merge_request.unchecked? ? "true" : "false"}, url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}", - ci_enable: #{@project.gitlab_ci? ? "true" : "false"}, + ci_enable: #{@project.ci_service ? "true" : "false"}, current_status: "#{@merge_request.merge_status_name}", action: "#{controller.action_name}" }); diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml index 80fe540489b..bff5b36821d 100644 --- a/app/views/projects/merge_requests/show/_state_widget.html.haml +++ b/app/views/projects/merge_requests/show/_state_widget.html.haml @@ -1,5 +1,5 @@ .panel.mr-state-widget.panel-default - - if @merge_request.source_project.gitlab_ci? && @commits.any? + - if @merge_request.source_project.ci_service && @commits.any? .panel-heading = render "projects/merge_requests/show/mr_ci" .panel-body diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index 70b4537fd37..f20efa76cbb 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -17,6 +17,9 @@ - @service.errors.full_messages.each do |msg| %li= msg + - if @service.help.present? + .bs-callout + = @service.help .form-group = f.label :active, "Active", class: "control-label" |