Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 5 deletions

diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb
index 5583c896803..d5c0b187f92 100644
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
@@ -44,10 +44,6 @@ module Gitlab
         add_blobs_to_batch_loader
       end
 
-      def use_semantic_ipynb_diff?
-        strong_memoize(:_use_semantic_ipynb_diff) { Feature.enabled?(:ipynb_semantic_diff, repository.project) }
-      end
-
       def has_renderable?
         rendered&.has_renderable?
       end
@@ -372,7 +368,7 @@ module Gitlab
       end
 
       def rendered
-        return unless use_semantic_ipynb_diff? && ipynb? && modified_file? && !collapsed? && !too_large?
+        return unless ipynb? && modified_file? && !collapsed? && !too_large?
 
         strong_memoize(:rendered) { Rendered::Notebook::DiffFile.new(self) }
       end