summaryrefslogtreecommitdiff
path: root/app/helpers/markup_helper.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-10 21:43:34 +0000
committerRobert Speicher <robert@gitlab.com>2017-05-10 21:43:34 +0000
commitcb2f739d4844af094f62edb4e4dff1b3413a405b (patch)
treec86ea111756a89d84e0601d554ddc78d3be780d0 /app/helpers/markup_helper.rb
parent000045e6647fd8c2e28b1a6dc12ce59f9bfc054f (diff)
parent3db37e05622aa3daa2be41bb9edc486cd2e54bcd (diff)
downloadgitlab-ce-cb2f739d4844af094f62edb4e4dff1b3413a405b.tar.gz
Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'
Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
Diffstat (limited to 'app/helpers/markup_helper.rb')
-rw-r--r--app/helpers/markup_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb
index b636233c426..0009cad86c4 100644
--- a/app/helpers/markup_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -32,7 +32,7 @@ module MarkupHelper
context = {
project: @project,
current_user: (current_user if defined?(current_user)),
- pipeline: :single_line,
+ pipeline: :single_line
}
gfm_body = Banzai.render(body, context)