Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 2 deletions

diff --git a/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb b/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb
index 88339df3475..1b50ef3fcff 100644
--- a/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb
+++ b/spec/support/shared_contexts/lib/gitlab/sidekiq_logging/structured_logger_shared_context.rb
@@ -68,7 +68,8 @@ RSpec.shared_context 'structured_logger' do
   let(:deferred_payload) do
     end_payload.merge(
       'message' => 'TestWorker JID-da883554ee4fe414012f5f42: deferred: 0.0 sec',
-      'job_status' => 'deferred'
+      'job_status' => 'deferred',
+      'job_deferred_by' => :feature_flag
     )
   end
 
diff --git a/spec/support/shared_examples/features/variable_list_shared_examples.rb b/spec/support/shared_examples/features/variable_list_shared_examples.rb
index 1211c9d19e6..d206f669b3e 100644
--- a/spec/support/shared_examples/features/variable_list_shared_examples.rb
+++ b/spec/support/shared_examples/features/variable_list_shared_examples.rb
@@ -186,7 +186,7 @@ RSpec.shared_examples 'variable list' do
     click_button('Add variable')
 
     fill_variable('empty_mask_key', '???', protected: true, masked: true) do
-      expect(page).to have_content('This variable can not be masked')
+      expect(page).to have_content('This variable value does not meet the masking requirements.')
       expect(find_button('Add variable', disabled: true)).to be_present
     end
   end