Merge branch 'remove_redundant_unscope' into 'master'

Remove redundant unscope from assocation

See merge request gitlab-org/gitlab!68131

app/models/project_feature.rb

@@ -49,10 +49,7 @@ class ProjectFeature < ApplicationRecord
     end
   end
 
-  # Default scopes force us to unscope here since a service may need to check
-  # permissions for a project in pending_delete
-  # http://stackoverflow.com/questions/1540645/how-to-disable-default-scope-for-a-belongs-to
-  belongs_to :project, -> { unscope(where: :pending_delete) }
+  belongs_to :project
 
   validates :project, presence: true
 

spec/models/project_feature_spec.rb

@@ -8,6 +8,8 @@ RSpec.describe ProjectFeature do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 
+  it { is_expected.to belong_to(:project) }
+
   describe 'PRIVATE_FEATURES_MIN_ACCESS_LEVEL_FOR_PRIVATE_PROJECT' do
     it 'has higher level than that of PRIVATE_FEATURES_MIN_ACCESS_LEVEL' do
       described_class::PRIVATE_FEATURES_MIN_ACCESS_LEVEL_FOR_PRIVATE_PROJECT.each do |feature, level|