diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index ae378b731402e157aed638b2c97a080f965dc65d..578c8a5360ca95a3e40b77f2820023aba7d870b8 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -1,10 +1,11 @@ +EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"] # Use this hook to configure devise mailer, warden hooks and so forth. The first # four configuration values can also be set straight in your models. Devise.setup do |config| # ==> Mailer Configuration # Configure the e-mail address which will be shown in Devise::Mailer, # note that it will be overwritten if you use your own mailer class with default "from" parameter. - config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com" + config.mailer_sender = EMAIL_OPTS["from"] # Configure the class responsible to send e-mails. # config.mailer = "Devise::Mailer" @@ -199,7 +200,7 @@ Devise.setup do |config| # up on your models and hooks. # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo' - #config.omniauth :ldap, + #config.omniauth :ldap, # :host => 'YOUR_LDAP_SERVER', # :base => 'THE_BASE_WHERE_YOU_SEARCH_FOR_USERS', # :uid => 'sAMAccountName', diff --git a/lib/tasks/bulk_import.rake b/lib/tasks/bulk_import.rake index de00a68ad4d4eb189d39dd9f8606fa7337f5f709..607250f177018644975c0d0070042452ac304c0c 100644 --- a/lib/tasks/bulk_import.rake +++ b/lib/tasks/bulk_import.rake @@ -90,8 +90,7 @@ def create_repo_project(project_name, user_email) # Add user as admin for project project.users_projects.create!( - :repo_access => Repository::REPO_RW, - :project_access => Project::PROJECT_RWA, + :project_access => UsersProject::MASTER, :user => user )