Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/models/concerns/has_variable_spec.rb b/spec/models/concerns/ci/has_variable_spec.rb
index 2bb21d7934e..c132fe47c3c 100644
--- a/spec/models/concerns/has_variable_spec.rb
+++ b/spec/models/concerns/ci/has_variable_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe HasVariable do
+describe Ci::HasVariable do
   subject { build(:ci_variable) }
 
   it { is_expected.to validate_presence_of(:key) }
diff --git a/spec/models/concerns/maskable_spec.rb b/spec/models/concerns/ci/maskable_spec.rb
index aeba7ad862f..22ffb294819 100644
--- a/spec/models/concerns/maskable_spec.rb
+++ b/spec/models/concerns/ci/maskable_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Maskable do
+describe Ci::Maskable do
   let(:variable) { build(:ci_variable) }
 
   describe 'masked value validations' do
@@ -34,7 +34,7 @@ describe Maskable do
   end
 
   describe 'REGEX' do
-    subject { Maskable::REGEX }
+    subject { Ci::Maskable::REGEX }
 
     it 'does not match strings shorter than 8 letters' do
       expect(subject.match?('hello')).to eq(false)