diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-19 22:34:05 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-19 22:34:05 +0300 |
commit | 406a0c809b3c10d8fb2754cf626094b98ee78aeb (patch) | |
tree | 0bf5ad709820620873f7a5b713b83c75c22be164 /app/views/services | |
parent | 85007434645c817e7674003bbdda0674287dd106 (diff) | |
download | gitlab-ce-406a0c809b3c10d8fb2754cf626094b98ee78aeb.tar.gz |
GitLabCi Service imtegration
Diffstat (limited to 'app/views/services')
-rw-r--r-- | app/views/services/_gitlab_ci.html.haml | 42 | ||||
-rw-r--r-- | app/views/services/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/services/index.html.haml | 15 |
3 files changed, 59 insertions, 0 deletions
diff --git a/app/views/services/_gitlab_ci.html.haml b/app/views/services/_gitlab_ci.html.haml new file mode 100644 index 00000000000..b2e2add3ceb --- /dev/null +++ b/app/views/services/_gitlab_ci.html.haml @@ -0,0 +1,42 @@ +%h3.page_title + Services → GitLab CI Integration + + .right + .thumbnail + - if @service.active + = image_tag 'service-gitlab-ci.png', class: 'small' + - else + = image_tag 'service-disabled-gitlab-ci.png', class: 'small' + +%hr + + += form_for(@service, :as => :service, :url => project_service_path(@project, @service), :method => :put) do |f| + - if @service.errors.any? + .alert-message.block-message.error + %ul + - @service.errors.full_messages.each do |msg| + %li= msg + + + .control-group + = f.label :active, "Active", class: "control-label" + .controls + = f.check_box :active + + .control-group + = f.label :active, "Project URL", class: "control-label" + .controls + = f.text_field :project_url, class: "input-xlarge", placeholder: "http://ci.gitlabhq.com/projects/3" + + .control-group + = f.label :token, class: "control-label" do + CI Project token + .controls + = f.text_field :token, class: "input-xlarge", placeholder: "GitLab CI project specific token" + + + .form-actions + = f.submit 'Save', class: 'btn save-btn' + + = link_to 'Test settings', test_project_service_path(@project), class: 'btn btn-small' diff --git a/app/views/services/edit.html.haml b/app/views/services/edit.html.haml new file mode 100644 index 00000000000..d893847f1ae --- /dev/null +++ b/app/views/services/edit.html.haml @@ -0,0 +1,2 @@ += render "projects/project_head" += render 'gitlab_ci' diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml new file mode 100644 index 00000000000..3894fcee369 --- /dev/null +++ b/app/views/services/index.html.haml @@ -0,0 +1,15 @@ += render "projects/project_head" +%h3.page_title Services +%hr + +.row + .span6 + .padded + %p.slead Continuous integration server from GitLab + .thumbnail.left + = link_to edit_project_service_path(@project, :gitlab_ci) do + - if @gitlab_ci_service.try :active + = image_tag 'service-gitlab-ci.png' + - else + = image_tag 'service-disabled-gitlab-ci.png' + |