diff options
Diffstat (limited to 'app/helpers/snippets_helper.rb')
| -rw-r--r-- | app/helpers/snippets_helper.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb index d6a9e447fbc..10c95da394f 100644 --- a/app/helpers/snippets_helper.rb +++ b/app/helpers/snippets_helper.rb @@ -60,9 +60,9 @@ module SnippetsHelper def snippet_badge(snippet) return unless attrs = snippet_badge_attributes(snippet) - css_class, text = attrs + icon_name, text = attrs tag.span(class: %w[badge badge-gray]) do - concat(tag.i(class: ['fa', css_class])) + concat(sprite_icon(icon_name, size: 14, css_class: 'gl-vertical-align-middle')) concat(' ') concat(text) end @@ -70,25 +70,24 @@ module SnippetsHelper def snippet_badge_attributes(snippet) if snippet.private? - ['fa-lock', _('private')] + ['lock', _('private')] end end - def embedded_raw_snippet_button - blob = @snippet.blob + def embedded_raw_snippet_button(snippet, blob) return if blob.empty? || blob.binary? || blob.stored_externally? link_to(external_snippet_icon('doc-code'), - gitlab_raw_snippet_url(@snippet), + gitlab_raw_snippet_blob_url(snippet, blob.path), class: 'btn', target: '_blank', rel: 'noopener noreferrer', title: 'Open raw') end - def embedded_snippet_download_button + def embedded_snippet_download_button(snippet, blob) link_to(external_snippet_icon('download'), - gitlab_raw_snippet_url(@snippet, inline: false), + gitlab_raw_snippet_blob_url(snippet, blob.path, nil, inline: false), class: 'btn', target: '_blank', title: 'Download', |