From 0a09925dcef1976970bc2674432f69d46786c38f Mon Sep 17 00:00:00 2001 From: mhasbini Date: Fri, 31 Mar 2017 18:11:28 +0300 Subject: Enable Style/Proc cop for rubocop --- app/mailers/base_mailer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/mailers/base_mailer.rb') diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb index 79c3c2e62c5..a9b6b33eb5c 100644 --- a/app/mailers/base_mailer.rb +++ b/app/mailers/base_mailer.rb @@ -5,8 +5,8 @@ class BaseMailer < ActionMailer::Base attr_accessor :current_user helper_method :current_user, :can? - default from: Proc.new { default_sender_address.format } - default reply_to: Proc.new { default_reply_to_address.format } + default from: proc { default_sender_address.format } + default reply_to: proc { default_reply_to_address.format } def can? Ability.allowed?(current_user, action, subject) -- cgit v1.2.1 From d95bffc6dad3e6d999fb4d5c8c66d7fea05c73b7 Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Mon, 3 Apr 2017 11:55:15 +0200 Subject: Rename GitlabMarkdownHelper -> MarkupHelper It does more than solely GitLab Markdown, so rename to MarkupHelper. --- app/mailers/base_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/mailers/base_mailer.rb') 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? -- cgit v1.2.1