diff --git a/app/controllers/rest/history_controller.rb b/app/controllers/rest/history_controller.rb
index a68df7a8..84bb1169 100644
--- a/app/controllers/rest/history_controller.rb
+++ b/app/controllers/rest/history_controller.rb
@@ -10,12 +10,12 @@ class HistoryController < Rest::ApplicationController
         {'id' => "#{organizational_unit_id}/#{repository_id}",
          'revision' => params[:revision],
          'path' => params[:path],
-         'limit' => params[:limit] && params[:limit].to_i,
-         'skip' => params[:skip] && params[:skip].to_i,
+         'limit' => params[:limit]&.to_i,
+         'skip' => params[:skip]&.to_i,
          'skipMerges' => ![nil, '', '0', 'false'].
            include?(params[:skipMerges]),
-         'before' => params[:before] && params[:before].to_i,
-         'after' => params[:after] && params[:after].to_i}
+         'before' => params[:before]&.to_i,
+         'after' => params[:after]&.to_i}
       end
       query <<-QUERY
         query ($id: ID!, $revision: String, $limit: Int, $skip: Int, $skipMerges: Boolean, $before: Time, $after: Time) {
diff --git a/app/models/multi_blob.rb b/app/models/multi_blob.rb
index b0fb3a53..0ac4f882 100644
--- a/app/models/multi_blob.rb
+++ b/app/models/multi_blob.rb
@@ -124,7 +124,7 @@ def valid?
       prefix = "files/#{index}/"
 
       if file[:path].blank?
-        field = file[:action].to_s.match?(/\Arename/) ? 'new_path' : 'path'
+        field = file[:action].to_s.start_with?('Arename') ? 'new_path' : 'path'
         @errors.add("#{prefix}#{field}", 'must be present')
       end
 
diff --git a/lib/refs_updater.rb b/lib/refs_updater.rb
index 363d8b58..e6dd19ab 100644
--- a/lib/refs_updater.rb
+++ b/lib/refs_updater.rb
@@ -29,7 +29,7 @@ def analyze(_ref, before, after)
                    unsafe_range: true,
                    only_commit_sha: true,
                    limit: nil}
-    git.log(log_options).reverse.each do |commit_sha|
+    git.log(log_options).reverse_each do |commit_sha|
       process_new_commit(commit_sha)
       ProcessCommitJob.perform_later(repository.pk, commit_sha)
     end
diff --git a/lib/tasks/apidoc.rake b/lib/tasks/apidoc.rake
index 44a3cdc0..80c21d3a 100644
--- a/lib/tasks/apidoc.rake
+++ b/lib/tasks/apidoc.rake
@@ -2,7 +2,6 @@
 
 require 'fileutils'
 namespace :apidoc do
-  # rubocop:enable Metrics/BlockLength
   APIDOC_DIR = Rails.root.join('apidoc').to_s
 
   desc <<~DESC.tr("\n", ' ')
diff --git a/spec/lib/importing_documents_reanalyzer_spec.rb b/spec/lib/importing_documents_reanalyzer_spec.rb
index 0ab13d78..f67a077b 100644
--- a/spec/lib/importing_documents_reanalyzer_spec.rb
+++ b/spec/lib/importing_documents_reanalyzer_spec.rb
@@ -68,7 +68,7 @@
     let(:file_version_creator) do
       lambda do |path = nil|
         options = {repository: repository,
-                   files: [{path: path ? path : generate(:filepath),
+                   files: [{path: path || generate(:filepath),
                             content: generate(:content),
                             encoding: 'plain',
                             action: path ? 'update' : 'create'}]}
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index ff92df54..803c44ef 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -6,7 +6,7 @@
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
-require File.expand_path('../../config/environment', __FILE__)
+require File.expand_path('../../config/environment', __dir__)
 # Prevent database truncation if the environment is production
 if Rails.env.production?
   abort('The Rails environment is running in production mode!')