diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2012-11-06 17:30:48 +0400 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2013-01-18 14:57:31 +0400 |
| commit | 296cdd591f7f01ffdbe18cd6a839bbd0e624dfba (patch) | |
| tree | fd910106cf092da00a7fbddfe4d6e19b1f9a00eb /config | |
| parent | b07e1b3aedf87fdf3ec7a6855cec8194b0a30a59 (diff) | |
Add optional signup.
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c1266daffc3..26bd0696946 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -31,6 +31,7 @@ gitlab: ## Project settings default_projects_limit: 10 + # signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled. ## Gravatar gravatar: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 87c2399e08c..4e31b65fab0 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -51,6 +51,7 @@ Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) Settings.gitlab['user'] ||= 'gitlab' +Settings.gitlab['signup_enabled'] ||= false Settings['gravatar'] ||= Settingslogic.new({}) Settings.gravatar['enabled'] = true if Settings.gravatar['enabled'].nil? diff --git a/config/routes.rb b/config/routes.rb index ee6dfe6d3e6..446817356e8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -121,7 +121,7 @@ Gitlab::Application.routes.draw do resources :projects, constraints: { id: /[^\/]+/ }, only: [:new, :create] - devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks } + devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks, registrations: :registrations } # # Project Area |