diff --git a/.haml-lint.yml b/.haml-lint.yml
index 5e7b600097a329b64f923658c38224c07cff2add..338b7b062cc0d6bbf2019e946aae2e22d47b44a0 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -130,6 +130,7 @@ linters:
       - Style/ColonMethodCall
       - Style/ConditionalAssignment
       - Style/HashSyntax
+      - Style/IfInsideElse
       - Style/IdenticalConditionalBranches
       - Style/NegatedIf
       - Style/NestedTernaryOperator
diff --git a/.rubocop_todo/style/if_inside_else.yml b/.rubocop_todo/style/if_inside_else.yml
index 3ce6e5ec7042181ec5d142c077055759063e27a7..40b71d7de04849ccd31605e728ec4c48fb7f239e 100644
--- a/.rubocop_todo/style/if_inside_else.yml
+++ b/.rubocop_todo/style/if_inside_else.yml
@@ -1,17 +1,13 @@
 ---
 Style/IfInsideElse:
-  # Offense count: 43
-  # Temporarily disabled due to too many offenses
-  Enabled: false
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/passwords_controller.rb'
     - 'app/finders/projects_finder.rb'
-    - 'app/finders/user_recent_events_finder.rb'
     - 'app/helpers/diff_helper.rb'
+    - 'app/helpers/issuables_helper.rb'
     - 'app/helpers/members_helper.rb'
     - 'app/helpers/search_helper.rb'
-    - 'app/models/ci/build.rb'
     - 'app/models/namespace.rb'
     - 'app/presenters/project_presenter.rb'
     - 'app/services/system_notes/commit_service.rb'
@@ -22,6 +18,7 @@ Style/IfInsideElse:
     - 'ee/app/controllers/ee/registrations/welcome_controller.rb'
     - 'ee/app/controllers/groups/omniauth_callbacks_controller.rb'
     - 'ee/app/models/ee/namespace.rb'
+    - 'ee/app/models/iterations/cadence.rb'
     - 'ee/app/models/protected_environments/authorizable.rb'
     - 'ee/app/policies/ee/group_policy.rb'
     - 'ee/app/services/app_sec/dast/site_profiles/audit/update_service.rb'
@@ -30,12 +27,15 @@ Style/IfInsideElse:
     - 'ee/app/services/geo/repository_base_sync_service.rb'
     - 'ee/app/services/gitlab_subscriptions/fetch_subscription_plans_service.rb'
     - 'ee/app/services/vulnerability_external_issue_links/create_service.rb'
+    - 'ee/app/workers/elastic/project_transfer_worker.rb'
+    - 'ee/app/workers/project_import_schedule_worker.rb'
     - 'ee/lib/gitlab/geo/base_batcher.rb'
     - 'lib/api/projects.rb'
     - 'lib/gitlab/auth.rb'
     - 'lib/gitlab/conflict/file.rb'
     - 'lib/gitlab/sql/pattern.rb'
     - 'lib/gitlab/usage/service_ping/payload_keys_processor.rb'
+    - 'lib/service_ping/build_payload.rb'
     - 'lib/tasks/gitlab/cleanup.rake'
     - 'lib/tasks/gitlab/shell.rake'
     - 'qa/qa/resource/protected_branch.rb'