Merge branch 'jira-related-improvements' into 'master'

Small refactors (JIRA related code)

See merge request gitlab-org/gitlab!17629

app/models/project_services/jira_service.rb

@@ -137,10 +137,9 @@ class JiraService < IssueTrackerService
 
     return if issue.nil? || has_resolution?(issue) || !jira_issue_transition_id.present?
 
-    commit_id = if entity.is_a?(Commit)
-                  entity.id
-                elsif entity.is_a?(MergeRequest)
-                  entity.diff_head_sha
+    commit_id = case entity
+                when Commit then entity.id
+                when MergeRequest then entity.diff_head_sha
                 end
 
     commit_url = build_entity_url(:commit, commit_id)
@@ -331,7 +330,6 @@ class JiraService < IssueTrackerService
   # Handle errors when doing Jira API calls
   def jira_request
     yield
-
   rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, URI::InvalidURIError, JIRA::HTTPError, OpenSSL::SSL::SSLError => e
     @error = e.message
     log_error("Error sending message", client_url: client_url, error: @error)

app/services/issues/close_service.rb

@@ -18,7 +18,7 @@ module Issues
     # The code calling this method is responsible for ensuring that a user is
     # allowed to close the given issue.
     def close_issue(issue, closed_via: nil, notifications: true, system_note: true)
-      if project.jira_tracker? && project.jira_service.active && issue.is_a?(ExternalIssue)
+      if project.jira_tracker_active? && issue.is_a?(ExternalIssue)
         project.jira_service.close_issue(closed_via, issue)
         todo_service.close_issue(issue, current_user)
         return issue

lib/gitlab/jira/http_client.rb

@@ -4,7 +4,7 @@ module Gitlab
   module Jira
     # Gitlab JIRA HTTP client to be used with jira-ruby gem, this subclasses JIRA::HTTPClient.
     # Uses Gitlab::HTTP to make requests to JIRA REST API.
-    # The parent class implementation can be found at: https://github.com/sumoheavy/jira-ruby/blob/v1.4.0/lib/jira/http_client.rb
+    # The parent class implementation can be found at: https://github.com/sumoheavy/jira-ruby/blob/v1.7.0/lib/jira/http_client.rb
     class HttpClient < JIRA::HttpClient
       extend ::Gitlab::Utils::Override
 
@@ -24,7 +24,7 @@ module Gitlab
           password: @options.delete(:password)
         }.to_json
 
-        make_request(:post, @options[:context_path] + '/rest/auth/1/session', body, { 'Content-Type' => 'application/json' })
+        make_request(:post, @options[:context_path] + '/rest/auth/1/session', body, 'Content-Type' => 'application/json')
       end
 
       override :make_request