diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-18 21:38:22 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-18 21:38:22 +0000 |
| commit | 4b6e6d0ad222e0fbacf300975be961fcbc7bdccd (patch) | |
| tree | 106a694130b5d0d8c9487339a8b48d9bc8795f5d /app/views/projects | |
| parent | 9065f9c5ff073d376eb6377ca63ead93623fc8a3 (diff) | |
| parent | 2e9d53586874a83cea7e7d29a49bde1180e15829 (diff) | |
| download | gitlab-ce-4b6e6d0ad222e0fbacf300975be961fcbc7bdccd.tar.gz | |
Merge branch 'issue_13343' into 'master'
Allow build email service to be tested
Fixes #13343
See merge request !5223
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index 1f13ea28b4e..166dc4a01fc 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -12,5 +12,5 @@ - 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}" + = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service), class: "btn #{disabled}", title: @service.disabled_title = link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel" |