Backport changes from EE
This commit is contained in:
parent
59ac184fcf
commit
02994fbe77
|
@ -1191,9 +1191,9 @@ Gitlab/ModuleWithInstanceVariables:
|
||||||
Enable: true
|
Enable: true
|
||||||
Exclude:
|
Exclude:
|
||||||
# We ignore Rails helpers right now because it's hard to workaround it
|
# We ignore Rails helpers right now because it's hard to workaround it
|
||||||
- app/helpers/*_helper.rb
|
- app/helpers/**/*_helper.rb
|
||||||
# We ignore Rails mailers right now because it's hard to workaround it
|
# We ignore Rails mailers right now because it's hard to workaround it
|
||||||
- app/mailers/emails/*.rb
|
- app/mailers/emails/**/*.rb
|
||||||
# We ignore spec helpers because it usually doesn't matter
|
# We ignore spec helpers because it usually doesn't matter
|
||||||
- spec/support/**/*.rb
|
- spec/support/**/*.rb
|
||||||
- features/steps/**/*.rb
|
- features/steps/**/*.rb
|
||||||
|
|
|
@ -81,7 +81,7 @@ module IssuableActions
|
||||||
private
|
private
|
||||||
|
|
||||||
def recaptcha_check_if_spammable(should_redirect = true, &block)
|
def recaptcha_check_if_spammable(should_redirect = true, &block)
|
||||||
return yield unless @issuable.is_a? Spammable
|
return yield unless issuable.is_a? Spammable
|
||||||
|
|
||||||
recaptcha_check_with_fallback(should_redirect, &block)
|
recaptcha_check_with_fallback(should_redirect, &block)
|
||||||
end
|
end
|
||||||
|
|
|
@ -139,7 +139,7 @@ module ExtractsPath
|
||||||
|
|
||||||
def lfs_blob_ids
|
def lfs_blob_ids
|
||||||
blob_ids = tree.blobs.map(&:id)
|
blob_ids = tree.blobs.map(&:id)
|
||||||
@lfs_blob_ids = Gitlab::Git::Blob.batch_lfs_pointers(@project.repository, blob_ids).map(&:id)
|
@lfs_blob_ids = Gitlab::Git::Blob.batch_lfs_pointers(@project.repository, blob_ids).map(&:id) # rubocop:disable Gitlab/ModuleWithInstanceVariables
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
Loading…
Reference in New Issue