diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-19 05:24:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-19 05:24:40 +0000 |
| commit | 4595d5bf4a4283d9b8dd8cde2096fb4e35c390b5 (patch) | |
| tree | 801491a6bb4d66c4769c894b4f11ed3f2fde8c26 | |
| parent | f3d50461962b1a9696cad234560d4362264ec411 (diff) | |
| parent | 5aa97ce91ba0e2ef06ea8a03b10d36287fb8768b (diff) | |
| download | gitlab-ce-4595d5bf4a4283d9b8dd8cde2096fb4e35c390b5.tar.gz | |
Merge branch 'show_test_settings_button' into 'master'
Show test settings as disabled when service cannot be tested.
See merge request !1725
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index bb983229b1c..32e97a754cb 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -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}" |