Skip to content
Snippets Groups Projects
Commit 02994fbe authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

Backport changes from EE

parent 59ac184f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -1191,9 +1191,9 @@ Gitlab/ModuleWithInstanceVariables:
Enable: true
Exclude:
# 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
- app/mailers/emails/*.rb
- app/mailers/emails/**/*.rb
# We ignore spec helpers because it usually doesn't matter
- spec/support/**/*.rb
- features/steps/**/*.rb
Loading
Loading
Loading
Loading
@@ -81,7 +81,7 @@ module IssuableActions
private
 
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)
end
Loading
Loading
Loading
Loading
@@ -139,7 +139,7 @@ module ExtractsPath
 
def lfs_blob_ids
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
 
private
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment