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

Merge branch 'show_test_settings_button' into 'master' 

Show test settings as disabled when service cannot be tested.

See merge request !1725
This commit is contained in:
Dmitriy Zaporozhets 2015-03-19 05:24:40 +00:00
parent f3d5046196 5aa97ce91b
commit 4595d5bf4a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/projects/services/_form.html.haml
View File

@ -101,5 +101,6 @@
.form-actions
= f.submit 'Save', class: 'btn btn-save'
 
- if @service.valid? && @service.activated? && @service.can_test?
= link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service.to_param), class: 'btn'
- if @service.valid? && @service.activated?
- disabled = @service.can_test? ? '':'disabled'
= link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service.to_param), class: "btn #{disabled}"