diff options
| -rw-r--r-- | .rubocop.yml | 4 | ||||
| -rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 2 | ||||
| -rw-r--r-- | lib/extracts_path.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index d103a14518f..7721cfaf850 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -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 diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index a2b6ec7bb6a..c3013884369 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -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 diff --git a/lib/extracts_path.rb b/lib/extracts_path.rb index aa9996c7685..d8aca3304c5 100644 --- a/lib/extracts_path.rb +++ b/lib/extracts_path.rb @@ -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 |