Send credentials array with build data

2 files changed, 21 insertions, 3 deletions

diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb
index e00d91a6b45..792ff628b09 100644
--- a/lib/ci/api/entities.rb
+++ b/lib/ci/api/entities.rb
@@ -32,6 +32,10 @@ module Ci
         expose :artifacts_file, using: ArtifactFile, if: ->(build, _) { build.artifacts? }
       end
 
+      class BuildCredentials < Grape::Entity
+        expose :type, :url, :username, :password
+      end
+
       class BuildDetails < Build
         expose :commands
         expose :repo_url
@@ -51,9 +55,7 @@ module Ci
         expose :variables
         expose :depends_on_builds, using: Build
 
-        expose :registry_url, if: ->(_, _) { Gitlab.config.registry.enabled } do |_|
-          Gitlab.config.registry.host_port
-        end
+        expose :credentials, using: BuildCredentials
       end
 
       class Runner < Grape::Entity
diff --git a/lib/gitlab/ci/build/credentials.rb b/lib/gitlab/ci/build/credentials.rb
new file mode 100644
index 00000000000..14f9e8d7244
--- /dev/null
+++ b/lib/gitlab/ci/build/credentials.rb
@@ -0,0 +1,16 @@
+module Gitlab
+  module Ci
+    module Build
+      class Credentials
+        attr_accessor :type, :url, :username, :password
+
+        def initialize(type, url, username, password)
+          @type = type
+          @url = url
+          @username = username
+          @password = password
+        end
+      end
+    end
+  end
+end