From d59d4d41455d5f27aaa8dcd458dc4c746506a6cc Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dzaporozhets@gitlab.com>
Date: Thu, 19 Feb 2015 20:48:49 +0000
Subject: [PATCH] Merge branch 'projects-limit-default' into 'master'

Correctly set default projects limit for new users.

See #2014.

Note that the projects limit still isn't retroactively applied to existing users (probably as intended)

See merge request !1547
---
 app/models/user.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index b203b57060..08ad619a90 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -56,14 +56,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,
@@ -142,6 +141,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
 
@@ -468,6 +468,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