summaryrefslogtreecommitdiff
path: root/lib/container_registry/client.rb
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2018-03-19 19:18:58 +1100
committerSimon Knox <psimyn@gmail.com>2018-03-19 19:18:58 +1100
commitfaf3110228c96b25760cf810afd5bc88405a26d4 (patch)
tree5d0d27d9eb4bc3b80a7ede343ae61e55d5743b30 /lib/container_registry/client.rb
parente42fbe41528704d8f9dc0493582889c9e691d9e6 (diff)
parent6cfea81e6dc51e9627e2b2f64e29834e0e9bfc60 (diff)
downloadgitlab-ce-43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted
Diffstat (limited to 'lib/container_registry/client.rb')
-rw-r--r--lib/container_registry/client.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb
index c7263f302ab..010ca1ec27b 100644
--- a/lib/container_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -52,6 +52,8 @@ module ContainerRegistry
conn.request(:authorization, :bearer, options[:token].to_s)
end
+ yield(conn) if block_given?
+
conn.adapter :net_http
end
@@ -80,8 +82,7 @@ module ContainerRegistry
def faraday
@faraday ||= Faraday.new(@base_uri) do |conn|
- initialize_connection(conn, @options)
- accept_manifest(conn)
+ initialize_connection(conn, @options, &method(:accept_manifest))
end
end