Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitlab/ci/build/rules/rule/clause/changes.rb b/lib/gitlab/ci/build/rules/rule/clause/changes.rb
index 82a59fdb4e1..4c5f02b4f7b 100644
--- a/lib/gitlab/ci/build/rules/rule/clause/changes.rb
+++ b/lib/gitlab/ci/build/rules/rule/clause/changes.rb
@@ -9,7 +9,7 @@ module Gitlab
         end
 
         def satisfied_by?(pipeline, context)
-          return true if pipeline.modified_paths.nil?
+          return true unless pipeline&.modified_paths
 
           expanded_globs = expand_globs(context)
           pipeline.modified_paths.any? do |path|
diff --git a/lib/gitlab/ci/build/rules/rule/clause/if.rb b/lib/gitlab/ci/build/rules/rule/clause/if.rb
index 499a265a1e2..dd131448287 100644
--- a/lib/gitlab/ci/build/rules/rule/clause/if.rb
+++ b/lib/gitlab/ci/build/rules/rule/clause/if.rb
@@ -8,7 +8,7 @@ module Gitlab
           @expression = expression
         end
 
-        def satisfied_by?(pipeline, context)
+        def satisfied_by?(_pipeline, context)
           ::Gitlab::Ci::Pipeline::Expression::Statement.new(
             @expression, context.variables_hash).truthful?
         end