1 files changed, 10 insertions, 6 deletions

diff --git a/lib/gitlab/ci/config/entry/variables.rb b/lib/gitlab/ci/config/entry/variables.rb
index efb469ee32a..3130aec0446 100644
--- a/lib/gitlab/ci/config/entry/variables.rb
+++ b/lib/gitlab/ci/config/entry/variables.rb
@@ -18,7 +18,9 @@ module Gitlab
           end
 
           def value
-            @config.to_h { |key, value| [key.to_s, expand_value(value)[:value]] }
+            @config.to_h do |key, data|
+              [key.to_s, expand_data(data)[:value]]
+            end
           end
 
           def self.default(**)
@@ -26,7 +28,9 @@ module Gitlab
           end
 
           def value_with_data
-            @config.to_h { |key, value| [key.to_s, expand_value(value)] }
+            @config.to_h do |key, data|
+              [key.to_s, expand_data(data)]
+            end
           end
 
           def use_value_data?
@@ -35,11 +39,11 @@ module Gitlab
 
           private
 
-          def expand_value(value)
-            if value.is_a?(Hash)
-              { value: value[:value].to_s, description: value[:description] }
+          def expand_data(data)
+            if data.is_a?(Hash)
+              { value: data[:value].to_s, description: data[:description] }.compact
             else
-              { value: value.to_s, description: nil }
+              { value: data.to_s }
             end
           end
         end