Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 5874b01ef2a..07d5be86b1e 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -149,7 +149,7 @@ module Gitlab
               @entries.delete(:type)
 
               # This is something of a hack, see issue for details:
-              # https://gitlab.com/gitlab-org/gitlab-ce/issues/67150
+              # https://gitlab.com/gitlab-org/gitlab-foss/issues/67150
               if !only_defined? && has_rules?
                 @entries.delete(:only)
                 @entries.delete(:except)
diff --git a/lib/gitlab/ci/config/entry/root.rb b/lib/gitlab/ci/config/entry/root.rb
index 0589ad3edf9..07022ff7b54 100644
--- a/lib/gitlab/ci/config/entry/root.rb
+++ b/lib/gitlab/ci/config/entry/root.rb
@@ -132,12 +132,12 @@ module Gitlab
             return unless @config.is_a?(Hash)
 
             @jobs_config = @config
-              .except(*self.class.reserved_nodes_names)  # rubocop: disable CodeReuse/ActiveRecord
+              .except(*self.class.reserved_nodes_names)
               .select do |name, config|
               Entry::Jobs.find_type(name, config).present?
             end
 
-            @config = @config.except(*@jobs_config.keys) # rubocop: disable CodeReuse/ActiveRecord
+            @config = @config.except(*@jobs_config.keys)
           end
         end
       end