diff options
Diffstat (limited to 'app/helpers/markup_helper.rb')
| -rw-r--r-- | app/helpers/markup_helper.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 6077a059f6f..fc558958ca3 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -266,9 +266,10 @@ module MarkupHelper def markdown_toolbar_button(options = {}) data = options[:data].merge({ container: 'body' }) + css_classes = %w[gl-button btn btn-default-tertiary btn-icon js-md has-tooltip] << options[:css_class].to_s content_tag :button, type: 'button', - class: 'gl-button btn btn-default-tertiary btn-icon js-md has-tooltip', + class: css_classes.join(' '), data: data, title: options[:title], aria: { label: options[:title] } do @@ -282,8 +283,8 @@ module MarkupHelper def asciidoc_unsafe(text, context = {}) context.reverse_merge!( - commit: @commit, - ref: @ref, + commit: @commit, + ref: @ref, requested_path: @path ) Gitlab::Asciidoc.render(text, context) @@ -323,9 +324,9 @@ module MarkupHelper current_user: (current_user if defined?(current_user)), # RepositoryLinkFilter and UploadLinkFilter - commit: @commit, - wiki: @wiki, - ref: @ref, + commit: @commit, + wiki: @wiki, + ref: @ref, requested_path: @path ) |