Add configurable default for projects_limit

brynary · Jun 29, 2012 · 97d74c2 · 97d74c2
1 parent 335f9d6
commit 97d74c2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
@@ -34,7 +34,7 @@ def team_update
 
 
   def new
-    @admin_user = User.new(:projects_limit => 10)
+    @admin_user = User.new(:projects_limit => GITLAB_OPTS["default_projects_limit"])
   end
 
   def edit

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -90,7 +90,8 @@ def self.find_for_ldap_auth(omniauth_info)
         :name => name,
         :email => email,
         :password => password,
-        :password_confirmation => password
+        :password_confirmation => password,
+        :projects_limit => GITLAB_OPTS["default_projects_limit"]
       )
     end
   end

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
@@ -27,3 +27,7 @@ git:
   git_max_size: 5242880 # 5.megabytes
   # Git timeout to read commit, in seconds
   git_timeout: 10
+
+# Gitlab settings
+gitlab:
+  default_projects_limit: 10
diff --git a/config/initializers/00_before_all.rb b/config/initializers/00_before_all.rb
@@ -1,3 +1,4 @@
 GIT_HOST = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git_host"]
 EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"]
 GIT_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git"]
+GITLAB_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitlab"]