From 369df86e710bd876b3d688472cdce987e27640a3 Mon Sep 17 00:00:00 2001 From: randx Date: Thu, 5 Jul 2012 21:29:37 +0300 Subject: [PATCH] Remove GITLAB_OPTS, fixed ldap user creation --- app/models/user.rb | 2 +- config/initializers/0_before_all.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 config/initializers/0_before_all.rb diff --git a/app/models/user.rb b/app/models/user.rb index ccb1dddf..4ead60a9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -91,7 +91,7 @@ class User < ActiveRecord::Base :email => email, :password => password, :password_confirmation => password, - :projects_limit => GITLAB_OPTS["default_projects_limit"] + :projects_limit => Gitlab.config.default_projects_limit ) end end diff --git a/config/initializers/0_before_all.rb b/config/initializers/0_before_all.rb deleted file mode 100644 index fc0575ad..00000000 --- a/config/initializers/0_before_all.rb +++ /dev/null @@ -1 +0,0 @@ -GITLAB_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitlab"]