summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-04-01 18:29:10 +0100
committerPhil Hughes <me@iamphill.com>2019-04-01 18:29:10 +0100
commite363e76af242f701263ef2441afd806946110dcf (patch)
tree275726c876ece99a5fb597b999eacc989b9742a3
parent0a480e3c32c4fd783b6a6271dad7c423e0d8bdd1 (diff)
downloadgitlab-ce-e363e76af242f701263ef2441afd806946110dcf.tar.gz
Fixed expand full file button showing on images
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59695
-rw-r--r--app/serializers/diff_file_entity.rb2
-rw-r--r--changelogs/unreleased/fix-expand-full-file-on-image.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb
index d3d5883e46b..2a5121a2266 100644
--- a/app/serializers/diff_file_entity.rb
+++ b/app/serializers/diff_file_entity.rb
@@ -57,7 +57,7 @@ class DiffFileEntity < DiffFileBaseEntity
diff_file.diff_lines_for_serializer
end
- expose :is_fully_expanded, if: -> (diff_file, _) { diff_file.text? } do |diff_file|
+ expose :is_fully_expanded do |diff_file|
diff_file.fully_expanded?
end
diff --git a/changelogs/unreleased/fix-expand-full-file-on-image.yml b/changelogs/unreleased/fix-expand-full-file-on-image.yml
new file mode 100644
index 00000000000..a88d30cfa38
--- /dev/null
+++ b/changelogs/unreleased/fix-expand-full-file-on-image.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed expand full file button showing on images
+merge_request:
+author:
+type: fixed