Correctly set default projects limit for new users.
This commit is contained in:
parent
3c2139ed17
commit
1d6050104c
1 changed files with 9 additions and 2 deletions
|
@ -55,14 +55,13 @@ class User < ActiveRecord::Base
|
|||
include Gitlab::ConfigHelper
|
||||
include TokenAuthenticatable
|
||||
extend Gitlab::ConfigHelper
|
||||
extend Gitlab::CurrentSettings
|
||||
include Gitlab::CurrentSettings
|
||||
|
||||
default_value_for :admin, false
|
||||
default_value_for :can_create_group, gitlab_config.default_can_create_group
|
||||
default_value_for :can_create_team, false
|
||||
default_value_for :hide_no_ssh_key, false
|
||||
default_value_for :hide_no_password, false
|
||||
default_value_for :projects_limit, current_application_settings.default_projects_limit
|
||||
default_value_for :theme_id, gitlab_config.default_theme
|
||||
|
||||
devise :database_authenticatable, :lockable, :async,
|
||||
|
@ -141,6 +140,7 @@ class User < ActiveRecord::Base
|
|||
|
||||
before_save :ensure_authentication_token
|
||||
after_save :ensure_namespace_correct
|
||||
after_initialize :set_projects_limit
|
||||
after_create :post_create_hook
|
||||
after_destroy :post_destroy_hook
|
||||
|
||||
|
@ -463,6 +463,13 @@ class User < ActiveRecord::Base
|
|||
end
|
||||
end
|
||||
|
||||
def set_projects_limit
|
||||
connection_default_value_defined = new_record? && !projects_limit_changed?
|
||||
return unless self.projects_limit.nil? || connection_default_value_defined
|
||||
|
||||
self.projects_limit = current_application_settings.default_projects_limit
|
||||
end
|
||||
|
||||
def requires_ldap_check?
|
||||
if !Gitlab.config.ldap.enabled
|
||||
false
|
||||
|
|
Loading…
Reference in a new issue