diff --git a/.rubocop.yml b/.rubocop.yml
index 01976bfbe04f9805b77fd4ea504905aa2833dd65..4727daa054509b863ab82674d8352895d965586e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -153,11 +153,11 @@ Style/EmptyLinesAroundBlockBody:
 
 # Keeps track of empty lines around class bodies.
 Style/EmptyLinesAroundClassBody:
-  Enabled: false
+  Enabled: true
 
 # Keeps track of empty lines around module bodies.
 Style/EmptyLinesAroundModuleBody:
-  Enabled: false
+  Enabled: true
 
 # Keeps track of empty lines around method bodies.
 Style/EmptyLinesAroundMethodBody:
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index 6ff40c6b461a10a99cf535f493947c40d3e5c1eb..2160cf7a6907f1424caf490ea7bd4379d2c0d60e 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -1,5 +1,4 @@
 module AvatarsHelper
-
   def author_avatar(commit_or_event, options = {})
     user_avatar(options.merge({
       user: commit_or_event.author,
@@ -26,5 +25,4 @@ def user_avatar(options = {})
       mail_to(options[:user_email], avatar)
     end
   end
-
 end
diff --git a/lib/banzai/filter/video_link_filter.rb b/lib/banzai/filter/video_link_filter.rb
index fd8b9a6f0cc642d6f2f30bd270acdc4c65e79c63..ac7bbcb0d10a7c5119af269138cabda389495e53 100644
--- a/lib/banzai/filter/video_link_filter.rb
+++ b/lib/banzai/filter/video_link_filter.rb
@@ -1,11 +1,9 @@
 module Banzai
   module Filter
-
     # Find every image that isn't already wrapped in an `a` tag, and that has
     # a `src` attribute ending with a video extension, add a new video node and
     # a "Download" link in the case the video cannot be played.
     class VideoLinkFilter < HTML::Pipeline::Filter
-
       def call
         doc.xpath(query).each do |el|
           el.replace(video_node(doc, el))
@@ -54,6 +52,5 @@ def video_node(doc, element)
         container
       end
     end
-
   end
 end
diff --git a/lib/gitlab/import_export/avatar_restorer.rb b/lib/gitlab/import_export/avatar_restorer.rb
index 352539eb594ead70aec67accc7d348ba31776f15..cfa595629f4758fd8ee6bd6d04d0f37d311fdb5b 100644
--- a/lib/gitlab/import_export/avatar_restorer.rb
+++ b/lib/gitlab/import_export/avatar_restorer.rb
@@ -1,7 +1,6 @@
 module Gitlab
   module ImportExport
     class AvatarRestorer
-
       def initialize(project:, shared:)
         @project = project
         @shared = shared