diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 21:09:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 21:09:38 +0000 |
| commit | 232e0a31f1e5d5b3a788dfc3dba8f8d41df36bf9 (patch) | |
| tree | a2b11b9a805ef1165d8730934ba4a4f801f31870 /app/serializers | |
| parent | 00fa950a34b1c94617110b150b8b2517d5241249 (diff) | |
| download | gitlab-ce-232e0a31f1e5d5b3a788dfc3dba8f8d41df36bf9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/diff_file_entity.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb index c3826692c52..45c16aabe9e 100644 --- a/app/serializers/diff_file_entity.rb +++ b/app/serializers/diff_file_entity.rb @@ -67,14 +67,14 @@ class DiffFileEntity < DiffFileBaseEntity private def parallel_diff_view?(options, diff_file) - return true unless Feature.enabled?(:single_mr_diff_view, diff_file.repository.project) + return true unless Feature.enabled?(:single_mr_diff_view, diff_file.repository.project, default_enabled: true) # If we're not rendering inline, we must be rendering parallel !inline_diff_view?(options, diff_file) end def inline_diff_view?(options, diff_file) - return true unless Feature.enabled?(:single_mr_diff_view, diff_file.repository.project) + return true unless Feature.enabled?(:single_mr_diff_view, diff_file.repository.project, default_enabled: true) # If nothing is present, inline will be the default. options.fetch(:diff_view, :inline).to_sym == :inline |