diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-05 21:29:37 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-07-05 21:29:37 +0300 |
| commit | 369df86e710bd876b3d688472cdce987e27640a3 (patch) | |
| tree | 59a01565dcc9fee6a4ccb26d779f92319fef4eb4 | |
| parent | 7f207d4a872cb55d302608a2739e94fc59ef1ff1 (diff) | |
| download | gitlab-ce-369df86e710bd876b3d688472cdce987e27640a3.tar.gz | |
Remove GITLAB_OPTS, fixed ldap user creation
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | config/initializers/0_before_all.rb | 1 |
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"] |