diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-24 09:33:22 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-24 09:33:22 +0300 |
| commit | 55f83385023adf0fc70a54922209388a223dd05f (patch) | |
| tree | a2efdaae7fc06a8f093cdd314dac8f678f44a224 /config | |
| parent | 1e1c5b7afe42d6d88997aaa4f4877c37965866a5 (diff) | |
| parent | 65989141dcc58eaa3cecfe98bc97a10075cf4f7e (diff) | |
| download | gitlab-ce-55f83385023adf0fc70a54922209388a223dd05f.tar.gz | |
Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/initializers/resque_mailer.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index dc6b734f0fa..3585c4b0a87 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,7 +23,7 @@ module Gitlab # config.plugins = [ :exception_notification, :ssl_requirement, :all ] # Activate observers that should always be running. - config.active_record.observers = :mailer_observer, :activity_observer, :project_observer, :key_observer + config.active_record.observers = :mailer_observer, :activity_observer, :project_observer, :key_observer, :issue_observer, :user_observer # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. diff --git a/config/initializers/resque_mailer.rb b/config/initializers/resque_mailer.rb new file mode 100644 index 00000000000..cec9dec9d0e --- /dev/null +++ b/config/initializers/resque_mailer.rb @@ -0,0 +1 @@ +Resque::Mailer.excluded_environments = [] |