Commit 13267580 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch '43522-technical-debt-service-disabled_title' into 'master'

Resolve "Technical debt: `Service#disabled_title` no longer used and is left dangling in `services/_form.html.haml`"

Closes #43522

See merge request gitlab-org/gitlab-ce!17305
parents fd4bb1e3 3185b87c
Pipeline #19015611 passed with stages
in 38 minutes and 47 seconds
......@@ -161,11 +161,6 @@ class JiraService < IssueTrackerService
add_comment(data, jira_issue)
end
# reason why service cannot be tested
def disabled_title
"Please fill in Password and Username."
end
def test(_)
result = test_settings
success = result.present?
......
......@@ -39,10 +39,6 @@ class PipelinesEmailService < Service
project.pipelines.any?
end
def disabled_title
'Please setup a pipeline on your repository.'
end
def test_data(project, user)
data = Gitlab::DataBuilder::Pipeline.build(project.pipelines.last)
data[:user] = user.hook_attrs
......
......@@ -162,11 +162,6 @@ class Service < ActiveRecord::Base
true
end
# reason why service cannot be tested
def disabled_title
"Please setup a project repository."
end
# Provide convenient accessor methods
# for each serialized property.
# Also keep track of updated properties in a similar way as ActiveModel::Dirty
......
......@@ -15,11 +15,6 @@
.footer-block.row-content-block
= service_save_button(@service)
&nbsp;
- if @service.valid? && @service.activated?
- unless @service.can_test?
- disabled_class = 'disabled'
- disabled_title = @service.disabled_title
= link_to 'Cancel', project_settings_integrations_path(@project), class: 'btn btn-cancel'
- if lookup_context.template_exists?('show', "projects/services/#{@service.to_param}", true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment