diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:26 +0000 |
| commit | 506159637da758f448818b834f8482238a9eb4eb (patch) | |
| tree | e114c46da6c1b98451a228b7559f5a6039c5df29 /app/models/user.rb | |
| parent | 045c0f9554a99c80d0a127540da168e272a9f977 (diff) | |
| download | gitlab-ce-506159637da758f448818b834f8482238a9eb4eb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index ee42a987939..47c5b3e208a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -246,6 +246,7 @@ class User < ApplicationRecord delegate :show_whitespace_in_diffs, :show_whitespace_in_diffs=, to: :user_preference delegate :sourcegraph_enabled, :sourcegraph_enabled=, to: :user_preference delegate :setup_for_company, :setup_for_company=, to: :user_preference + delegate :render_whitespace_in_code, :render_whitespace_in_code=, to: :user_preference accepts_nested_attributes_for :user_preference, update_only: true |