diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 09:06:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 09:06:25 +0000 |
| commit | d8211a0ed119eada7d292e974a8fc7b0cd982d3c (patch) | |
| tree | a14bfca83dd6b71144959d7e7a6d058f5d8922a5 /app/views | |
| parent | edd042071d1b5e6f494881dc2d9c39b46e42f74b (diff) | |
| download | gitlab-ce-d8211a0ed119eada7d292e974a8fc7b0cd982d3c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 0887e8e64da..84657592cd8 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -61,6 +61,10 @@ = f.select :project_view, project_view_choices, {}, class: 'select2' .form-text.text-muted = s_('Preferences|Choose what content you want to see on a project’s overview page.') + .form-group.form-check + = 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 in diffs') .col-sm-12 %hr diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index ea166d622eb..da90c41e2f5 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -83,7 +83,8 @@ changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg'), is_fluid_layout: fluid_layout.to_s, dismiss_endpoint: user_callouts_path, - show_suggest_popover: show_suggest_popover?.to_s } } + show_suggest_popover: show_suggest_popover?.to_s, + show_whitespace_default: @show_whitespace_default.to_s } } .mr-loading-status = spinner |