1 files changed, 4 insertions, 8 deletions
diff --git a/lib/declarative_policy.rb b/lib/declarative_policy.rb
index 5e22523e45a..7ba48ae9c79 100644
--- a/lib/declarative_policy.rb
+++ b/lib/declarative_policy.rb
@@ -22,14 +22,10 @@ module DeclarativePolicy
       key = Cache.policy_key(user, subject)
 
       cache[key] ||=
-        if Gitlab.rails5?
-          # to avoid deadlocks in multi-threaded environment when
-          # autoloading is enabled, we allow concurrent loads,
-          # https://gitlab.com/gitlab-org/gitlab-ce/issues/48263
-          ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-            class_for(subject).new(user, subject, opts)
-          end
-        else
+        # to avoid deadlocks in multi-threaded environment when
+        # autoloading is enabled, we allow concurrent loads,
+        # https://gitlab.com/gitlab-org/gitlab-ce/issues/48263
+        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
           class_for(subject).new(user, subject, opts)
         end
     end