diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 5ebe6f180e6..ee544d8ac56 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -446,8 +446,8 @@ module Ci
       return unless trace
 
       trace = trace.dup
-      Ci::MaskSecret.mask!(trace, project.runners_token) if project
-      Ci::MaskSecret.mask!(trace, token)
+      Gitlab::Ci::MaskSecret.mask!(trace, project.runners_token) if project
+      Gitlab::Ci::MaskSecret.mask!(trace, token)
       trace
     end
 
diff --git a/lib/ci/assets/.gitkeep b/lib/ci/assets/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/lib/ci/mask_secret.rb b/lib/ci/mask_secret.rb
deleted file mode 100644
index 997377abc55..00000000000
--- a/lib/ci/mask_secret.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Ci::MaskSecret
-  class << self
-    def mask!(value, token)
-      return value unless value.present? && token.present?
-
-      value.gsub!(token, 'x' * token.length)
-      value
-    end
-  end
-end
diff --git a/lib/gitlab/ci/mask_secret.rb b/lib/gitlab/ci/mask_secret.rb
new file mode 100644
index 00000000000..0daddaa638c
--- /dev/null
+++ b/lib/gitlab/ci/mask_secret.rb
@@ -0,0 +1,12 @@
+module Gitlab
+  module Ci::MaskSecret
+    class << self
+      def mask!(value, token)
+        return value unless value.present? && token.present?
+
+        value.gsub!(token, 'x' * token.length)
+        value
+      end
+    end
+  end
+end
diff --git a/spec/lib/ci/mask_secret_spec.rb b/spec/lib/gitlab/ci/mask_secret_spec.rb
similarity index 94%
rename from spec/lib/ci/mask_secret_spec.rb
rename to spec/lib/gitlab/ci/mask_secret_spec.rb
index f7b753b022b..3789a142248 100644
--- a/spec/lib/ci/mask_secret_spec.rb
+++ b/spec/lib/gitlab/ci/mask_secret_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Ci::MaskSecret do
+describe Gitlab::Ci::MaskSecret do
   subject { described_class }
 
   describe '#mask' do