diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-04-27 20:29:01 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-04-27 20:29:01 +0300 |
| commit | e2e1cac23880d58e5c81ce61ecf95985066bdfc9 (patch) | |
| tree | 23c64ed9b794cb35fce79fc1a66151cf57437edb /app/mailers | |
| parent | 0748960bfeae0e8db53b7a11ec5df20987a45bee (diff) | |
| parent | 00e4ec55c3b8757e6d5fb8bf3176dd7e20966b3a (diff) | |
Merge remote-tracking branch 'ce/master' into nt/ce-to-ee-thursday
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/base_mailer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb index a9b6b33eb5c..d2980db218a 100644 --- a/app/mailers/base_mailer.rb +++ b/app/mailers/base_mailer.rb @@ -1,6 +1,6 @@ class BaseMailer < ActionMailer::Base helper ApplicationHelper - helper GitlabMarkdownHelper + helper MarkupHelper attr_accessor :current_user helper_method :current_user, :can? |