Merge branch '292736-jira-ruby-gem-update' into 'master'

[RUN AS-IF-FOSS] Update jira-ruby gem to v2.1.4

See merge request gitlab-org/gitlab!50830

Gemfile

@@ -242,7 +242,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
 gem 'hipchat', '~> 1.5.0'
 
 # Jira integration
-gem 'jira-ruby', '~> 2.0.0'
+gem 'jira-ruby', '~> 2.1.4'
 gem 'atlassian-jwt', '~> 0.2.0'
 
 # Flowdock integration

Gemfile.lock

@@ -609,7 +609,7 @@ GEM
     jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
-    jira-ruby (2.0.0)
+    jira-ruby (2.1.4)
       activesupport
       atlassian-jwt
       multipart-post
@@ -1397,7 +1397,7 @@ DEPENDENCIES
   icalendar
   invisible_captcha (~> 0.12.1)
   ipaddress (~> 0.8.3)
-  jira-ruby (~> 2.0.0)
+  jira-ruby (~> 2.1.4)
   js_regex (~> 3.4)
   json (~> 2.3.0)
   json-schema (~> 2.8.0)

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.7.0/lib/jira/http_client.rb
+    # The parent class implementation can be found at: https://github.com/sumoheavy/jira-ruby/blob/master/lib/jira/http_client.rb
     class HttpClient < JIRA::HttpClient
       extend ::Gitlab::Utils::Override
 
@@ -43,6 +43,8 @@ module Gitlab
         result
       end
 
+      private
+
       def auth_params
         return {} unless @options[:username] && @options[:password]
 
@@ -54,8 +56,6 @@ module Gitlab
         }
       end
 
-      private
-
       def get_cookies
         cookie_array = @cookies.values.map { |cookie| "#{cookie.name}=#{cookie.value[0]}" }
         cookie_array += Array(@options[:additional_cookies]) if @options.key?(:additional_cookies)