diff options
| author | James Edwards-Jones <jamedjo@gmail.com> | 2018-02-23 01:25:42 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-03-15 22:52:24 +0000 |
| commit | 3185b87c7454e4e4b7d81f72bb5b35fd2a0000da (patch) | |
| tree | 05b84c46a88deca904c9dd823bf73f27af127519 /app | |
| parent | 7834f63c07dd52965e3aa30262d2b8f130c955aa (diff) | |
| download | gitlab-ce-43522-technical-debt-service-disabled_title.tar.gz | |
Removed unused `Service#disabled_title` methods43522-technical-debt-service-disabled_title
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_services/jira_service.rb | 5 | ||||
| -rw-r--r-- | app/models/project_services/pipelines_email_service.rb | 4 | ||||
| -rw-r--r-- | app/models/service.rb | 5 | ||||
| -rw-r--r-- | app/views/projects/services/_form.html.haml | 5 |
4 files changed, 0 insertions, 19 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 436a870b0c4..09b784fa23b 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -159,11 +159,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? diff --git a/app/models/project_services/pipelines_email_service.rb b/app/models/project_services/pipelines_email_service.rb index 9c7b58dead5..4cf149ac044 100644 --- a/app/models/project_services/pipelines_email_service.rb +++ b/app/models/project_services/pipelines_email_service.rb @@ -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 diff --git a/app/models/service.rb b/app/models/service.rb index 369cae2e85f..8e768b8ec45 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -151,11 +151,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 diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index 17e804d682b..e4c1e9ec67a 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -12,11 +12,6 @@ .footer-block.row-content-block = service_save_button(@service) - - 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) |