Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

d73d2a5e · Dmitriy Zaporozhets · 69e9c414 · f41634c7 · d73d2a5e · d73d2a5e
Commit d73d2a5e authored Nov 30, 2015 by Dmitriy Zaporozhets
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 66 additions and 1 deletion

app/helpers/emails_helper.rb app/helpers/emails_helper.rb +2 -0

spec/mailers/notify_spec.rb spec/mailers/notify_spec.rb +64 -1

No files found.
--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
@@ -28,6 +28,8 @@ module EmailsHelper
        return "View #{action.humanize.singularize}"
      end
    end
+
+    nil
  end

  def color_email_diff(diffcontent)

--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb