diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-03-21 19:43:54 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-25 13:53:37 +0300 |
| commit | b223a103fa36efe553e37396dfb5ff2cab095876 (patch) | |
| tree | a7d69e14936b65109e93aab931992f83084c0f2e /app | |
| parent | 5c67aeaf5ab5dfbbca9d919ec4f958233ea593d8 (diff) | |
Merge branch '59147-duplicate-match-line' into 'master'
Fix duplicated bottom match line
Closes #59147
See merge request gitlab-org/gitlab-ce!26402
(cherry picked from commit 7d3c5d882c1ddb7a78241e326996f30d67fce4b8)
8723f292 Fix diff bottom expand button appears twice
Diffstat (limited to 'app')
| -rw-r--r-- | app/serializers/diff_file_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb index 13711070a46..066e30cd3bb 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, _) { Feature.enabled?(:expand_diff_full_file) && diff_file.text? } do |diff_file| + expose :is_fully_expanded, if: -> (diff_file, _) { Feature.enabled?(:expand_diff_full_file, default_enabled: true) && diff_file.text? } do |diff_file| diff_file.fully_expanded? end |