Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 0 deletions

diff --git a/app/models/diff_viewer/base.rb b/app/models/diff_viewer/base.rb
index 31118791075..4fd3ee8425c 100644
--- a/app/models/diff_viewer/base.rb
+++ b/app/models/diff_viewer/base.rb
@@ -72,6 +72,10 @@ module DiffViewer
       !@initially_binary && diff_file.binary_in_repo?
     end
 
+    def generated?
+      diff_file.generated?
+    end
+
     # This method is used on the server side to check whether we can attempt to
     # render the diff_file at all. The human-readable error message can be
     # retrieved by #render_error_message.
diff --git a/app/serializers/diff_viewer_entity.rb b/app/serializers/diff_viewer_entity.rb
index f8d9778a3ee..294d50f5f10 100644
--- a/app/serializers/diff_viewer_entity.rb
+++ b/app/serializers/diff_viewer_entity.rb
@@ -5,6 +5,7 @@ class DiffViewerEntity < Grape::Entity
   expose :render_error, as: :error
   expose :render_error_message, as: :error_message
   expose :collapsed?, as: :collapsed
+  expose :generated?, as: :generated
   expose :whitespace_only do |_, options|
     options[:whitespace_only]
   end