summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/user.rb2
-rw-r--r--config/initializers/0_before_all.rb1
2 files changed, 1 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index ccb1dddfef6..4ead60a92db 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 fc0575ad5e0..00000000000
--- a/config/initializers/0_before_all.rb
+++ /dev/null
@@ -1 +0,0 @@
-GITLAB_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitlab"]