summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2017-04-03 11:55:15 +0200
committerToon Claes <toon@gitlab.com>2017-04-27 13:22:17 +0200
commitd95bffc6dad3e6d999fb4d5c8c66d7fea05c73b7 (patch)
treedd478a4bfd8b22438546d7824fe97281213ac7c2 /app
parent025b04f3e7976ac8829e24fcb587d86574b0037d (diff)
downloadgitlab-ce-d95bffc6dad3e6d999fb4d5c8c66d7fea05c73b7.tar.gz
Rename GitlabMarkdownHelper -> MarkupHelper
It does more than solely GitLab Markdown, so rename to MarkupHelper.
Diffstat (limited to 'app')
-rw-r--r--app/helpers/markup_helper.rb (renamed from app/helpers/gitlab_markdown_helper.rb)2
-rw-r--r--app/mailers/base_mailer.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/markup_helper.rb
index 106feb87398..a10714e81ae 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -1,6 +1,6 @@
require 'nokogiri'
-module GitlabMarkdownHelper
+module MarkupHelper
# Use this in places where you would normally use link_to(gfm(...), ...).
#
# It solves a problem occurring with nested links (i.e.
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?