Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-08 00:10:18 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-08 00:10:18 +0300
commitfd320d0858df108b47ebadaa546a3c99f0e44cf1 (patch)
tree10fd76baeaf079ba50392d569c52d3d711169c8b /lib/gitlab/jira
parentdec7332357ae21be289ac26a4c440cb0b5fa1002 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/jira')
-rw-r--r--lib/gitlab/jira/http_client.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/jira/http_client.rb b/lib/gitlab/jira/http_client.rb
index c09d8170d17..f0b08bb6b6a 100644
--- a/lib/gitlab/jira/http_client.rb
+++ b/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)