From eca3cd3a9e7d9ea680086cad8150050ec8cdef3f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 15 Nov 2019 18:06:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/user.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/models/user.rb') diff --git a/app/models/user.rb b/app/models/user.rb index f704589ad80..d0e758b0055 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -240,6 +240,7 @@ class User < ApplicationRecord delegate :time_display_relative, :time_display_relative=, to: :user_preference delegate :time_format_in_24h, :time_format_in_24h=, to: :user_preference 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 accepts_nested_attributes_for :user_preference, update_only: true -- cgit v1.2.1