diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-04-02 10:27:04 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-04-02 10:27:04 +0000 |
| commit | d4a4f68db5a2c680f6aa174e6abba35ed83a2d89 (patch) | |
| tree | 0a8446b87a59782953b153f3af878b275f01990a | |
| parent | a3fd1a134ca1eff24747528439fbdc53c11aa49c (diff) | |
| parent | e363e76af242f701263ef2441afd806946110dcf (diff) | |
| download | gitlab-ce-d4a4f68db5a2c680f6aa174e6abba35ed83a2d89.tar.gz | |
Merge branch 'fix-expand-full-file-on-image' into 'master'
Fixed expand full file button showing on images
Closes #59695
See merge request gitlab-org/gitlab-ce!26830
| -rw-r--r-- | app/serializers/diff_file_entity.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-expand-full-file-on-image.yml | 5 |
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 |