Download as
Browse Code »

Commit ea72d5fa8772922597925e0ed56730a056ebd1c7

Authored by Sque Squarious
1 parent 1202a727
Exists in master and in 9 other branches 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Add support for 'signin_enabled' option

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @ea72d5f
@@ -60,6 +60,7 @@ default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil @@ -60,6 +60,7 @@ default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil
60 default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil 60 default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil
61 default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil 61 default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil
62 default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil 62 default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil
  63 +default['gitlab']['gitlab-rails']['gitlab_signin_enabled'] = true
63 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = true 64 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = true
64 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = true 65 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = true
65 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = true 66 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = true
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @ea72d5f
@@ -51,7 +51,7 @@ production: &base @@ -51,7 +51,7 @@ production: &base
51 signup_enabled: <%= @gitlab_signup_enabled %> 51 signup_enabled: <%= @gitlab_signup_enabled %>
52 # 52 #
53 # default: true - If set to false, standard login form won't be shown on the sign-in page 53 # default: true - If set to false, standard login form won't be shown on the sign-in page
54 - # signin_enabled: false 54 + signin_enabled: <%= @gitlab_signin_enabled %>
55 55
56 56
57 # Restrict setting visibility levels for non-admin users. 57 # Restrict setting visibility levels for non-admin users.