From 2cb37cdf8cdb2d9b34fb8ef4438695e563068396 Mon Sep 17 00:00:00 2001 From: Owen Date: Wed, 7 Mar 2012 20:30:13 +1100 Subject: [PATCH 1/3] Update devise.rb to use the from address as defined in config/gitlab.yml --- config/initializers/devise.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index ae378b73140..578c8a5360c 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', -- GitLab From ed8fddf2a0ceb155d25c15ae5331c22e4340303d Mon Sep 17 00:00:00 2001 From: Owen Date: Wed, 7 Mar 2012 20:27:08 +1100 Subject: [PATCH 2/3] Update bulk_import rake task to use new permission model for projects --- lib/tasks/bulk_import.rake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/tasks/bulk_import.rake b/lib/tasks/bulk_import.rake index de00a68ad4d..70cbeeca685 100644 --- a/lib/tasks/bulk_import.rake +++ b/lib/tasks/bulk_import.rake @@ -89,9 +89,8 @@ def create_repo_project(project_name, user_email) end # Add user as admin for project - project.users_projects.create!( - :repo_access => Repository::REPO_RW, - :project_access => Project::PROJECT_RWA, + @project.users_projects.create!( + :project_access => UsersProject::MASTER, :user => user ) -- GitLab From 96640211645bcb206b280e6295d4b87a392137e3 Mon Sep 17 00:00:00 2001 From: Owen Date: Thu, 8 Mar 2012 00:06:52 +1100 Subject: [PATCH 3/3] Fixed silly typo in bulk_import task --- lib/tasks/bulk_import.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/bulk_import.rake b/lib/tasks/bulk_import.rake index 70cbeeca685..607250f1770 100644 --- a/lib/tasks/bulk_import.rake +++ b/lib/tasks/bulk_import.rake @@ -89,7 +89,7 @@ def create_repo_project(project_name, user_email) end # Add user as admin for project - @project.users_projects.create!( + project.users_projects.create!( :project_access => UsersProject::MASTER, :user => user ) -- GitLab