summaryrefslogtreecommitdiff
path: root/app/views/profiles/preferences/show.html.haml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-23 18:27:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-23 18:27:09 +0000
commitbcc70301531b6c3118120173389f2aaa7452bf11 (patch)
tree161f1ee56e15ec9e59f48c5e1a9cb86b62469a49 /app/views/profiles/preferences/show.html.haml
parentd47fc5085a706ab37d038636c9d5934da69853f0 (diff)
downloadgitlab-ce-bcc70301531b6c3118120173389f2aaa7452bf11.tar.gz
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/views/profiles/preferences/show.html.haml')
-rw-r--r--app/views/profiles/preferences/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index 659b3066603..bc1f2cb3072 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -70,7 +70,7 @@
= f.check_box :show_whitespace_in_diffs, class: 'form-check-input'
= f.label :show_whitespace_in_diffs, class: 'form-check-label' do
= s_('Preferences|Show whitespace changes in diffs')
- - if Feature.enabled?(:view_diffs_file_by_file)
+ - if Feature.enabled?(:view_diffs_file_by_file, default_enabled: true)
.form-group.form-check
= f.check_box :view_diffs_file_by_file, class: 'form-check-input'
= f.label :view_diffs_file_by_file, class: 'form-check-label' do