diff options
| author | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
|---|---|---|
| committer | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
| commit | ed7065bbdb6f6fad3cc8fb369267fa811767c8a5 (patch) | |
| tree | b3fda377c51504a6d21da1742cac3de7fd668ef0 /app/serializers/diff_file_base_entity.rb | |
| parent | 26c7d04cd06d1126e4a4a7a1c9308d12de77172e (diff) | |
| parent | 094d740886eaf62fd219dacd11aa9a966758a962 (diff) | |
| download | gitlab-ce-ed7065bbdb6f6fad3cc8fb369267fa811767c8a5.tar.gz | |
Merge branch 'master' into 56937-edit-knative-domain-after-it-has-been-deployed56937-edit-knative-domain-after-it-has-been-deployed
Diffstat (limited to 'app/serializers/diff_file_base_entity.rb')
| -rw-r--r-- | app/serializers/diff_file_base_entity.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/serializers/diff_file_base_entity.rb b/app/serializers/diff_file_base_entity.rb index 06a8db78476..ede9e04b722 100644 --- a/app/serializers/diff_file_base_entity.rb +++ b/app/serializers/diff_file_base_entity.rb @@ -72,17 +72,20 @@ class DiffFileBaseEntity < Grape::Entity expose :old_path expose :new_path expose :new_file?, as: :new_file - expose :collapsed?, as: :collapsed - expose :text?, as: :text + expose :renamed_file?, as: :renamed_file + expose :deleted_file?, as: :deleted_file + expose :diff_refs + expose :stored_externally?, as: :stored_externally expose :external_storage - expose :renamed_file?, as: :renamed_file - expose :deleted_file?, as: :deleted_file + expose :mode_changed?, as: :mode_changed expose :a_mode expose :b_mode + expose :viewer, using: DiffViewerEntity + private def memoized_submodule_links(diff_file) |