summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-11-30 14:53:30 +0200
committerValery Sizov <valery@gitlab.com>2016-11-30 14:53:30 +0200
commit32c6c9c457d88071ad82728ea6111a2d7d31b634 (patch)
treefe7f181e05f7268d5cdb177b05d763f5c22c3634 /config/initializers
parent7a155137a4fd965cb8ff512a9548a7e685b330f5 (diff)
parent43c8788e7bd4c705bc8215ea2409b21a19d090f7 (diff)
downloadgitlab-ce-32c6c9c457d88071ad82728ea6111a2d7d31b634.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/email_template_interceptor.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/email_template_interceptor.rb b/config/initializers/email_template_interceptor.rb
new file mode 100644
index 00000000000..f195ca9bcd6
--- /dev/null
+++ b/config/initializers/email_template_interceptor.rb
@@ -0,0 +1,2 @@
+# Interceptor in lib/email_template_interceptor.rb
+ActionMailer::Base.register_interceptor(EmailTemplateInterceptor)