-
Izaak Alpert authored
GITLAB-1262 Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a Conflicts: app/models/user.rb config/initializers/1_settings.rb spec/models/user_spec.rb
51e6095d
GITLAB-1262 Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a Conflicts: app/models/user.rb config/initializers/1_settings.rb spec/models/user_spec.rb