Remove GITLAB_OPTS, fixed ldap user creation

randx
1 parent 7f207d4a
Showing 2 changed files with 1 additions and 2 deletions Show diff stats
app/models/user.rb
config/initializers/0_before_all.rb
@@ -91,7 +91,7 @@ class User &lt; 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
@@ -1 +0,0 @@
-GITLAB_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitlab"]
	@@ -91,7 +91,7 @@ class User < ActiveRecord::Base		@@ -91,7 +91,7 @@ class User < ActiveRecord::Base
91	:email => email,	91	:email => email,
92	:password => password,	92	:password => password,
93	:password_confirmation => password,	93	:password_confirmation => password,
94	- :projects_limit => GITLAB_OPTS["default_projects_limit"]	94	+ :projects_limit => Gitlab.config.default_projects_limit
95	)	95	)
96	end	96	end
97	end	97	end
	@@ -1 +0,0 @@		@@ -1 +0,0 @@
1	-GITLAB_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitlab"]