diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/models/integrations/jira.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/models/integrations/jira.rb')
-rw-r--r-- | app/models/integrations/jira.rb | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/app/models/integrations/jira.rb b/app/models/integrations/jira.rb index a5aee35bada..1dc5c0db9e3 100644 --- a/app/models/integrations/jira.rb +++ b/app/models/integrations/jira.rb @@ -272,6 +272,10 @@ module Integrations test(nil)[:success] end + def configured? + active? && valid_connection? + end + def test(_) result = server_info success = result.present? @@ -533,7 +537,7 @@ module Integrations def update_deployment_type? (api_url_changed? || url_changed? || username_changed? || password_changed?) && - can_test? + testable? end def update_deployment_type @@ -573,15 +577,6 @@ module Integrations data_fields.deployment_server! end end - - def self.event_description(event) - case event - when "merge_request", "merge_request_events" - s_("JiraService|Jira comments are created when an issue is referenced in a merge request.") - when "commit", "commit_events" - s_("JiraService|Jira comments are created when an issue is referenced in a commit.") - end - end end end |