diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/views/snippets | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/views/snippets')
-rw-r--r-- | app/views/snippets/_actions.html.haml | 35 | ||||
-rw-r--r-- | app/views/snippets/show.html.haml | 8 |
2 files changed, 1 insertions, 42 deletions
diff --git a/app/views/snippets/_actions.html.haml b/app/views/snippets/_actions.html.haml deleted file mode 100644 index 566395133a1..00000000000 --- a/app/views/snippets/_actions.html.haml +++ /dev/null @@ -1,35 +0,0 @@ -- return unless current_user - -.d-none.d-sm-block - - if can?(current_user, :update_snippet, @snippet) - = link_to edit_snippet_path(@snippet), class: "btn btn-grouped" do - = _("Edit") - - if can?(current_user, :admin_snippet, @snippet) - = link_to gitlab_snippet_path(@snippet), method: :delete, data: { confirm: _("Are you sure?") }, class: "btn btn-grouped btn-inverted btn-remove", title: _('Delete Snippet') do - = _("Delete") - - if can?(current_user, :create_snippet) - = link_to new_snippet_path, class: "btn btn-grouped btn-success btn-inverted", title: _("New snippet") do - = _("New snippet") - - if @snippet.submittable_as_spam_by?(current_user) - = link_to _('Submit as spam'), mark_as_spam_snippet_path(@snippet), method: :post, class: 'btn btn-grouped btn-spam', title: _('Submit as spam') -.d-block.d-sm-none.dropdown - %button.btn.btn-default.btn-block.gl-mb-0.gl-mt-2{ data: { toggle: "dropdown" } } - = _("Options") - = icon('caret-down') - .dropdown-menu.dropdown-menu-full-width - %ul - - if can?(current_user, :create_snippet) - %li - = link_to new_snippet_path, title: _("New snippet") do - = _("New snippet") - - if can?(current_user, :admin_snippet, @snippet) - %li - = link_to gitlab_snippet_path(@snippet), method: :delete, data: { confirm: _("Are you sure?") }, title: _('Delete Snippet') do - = _("Delete") - - if can?(current_user, :update_snippet, @snippet) - %li - = link_to edit_snippet_path(@snippet) do - = _("Edit") - - if @snippet.submittable_as_spam_by?(current_user) - %li - = link_to _('Submit as spam'), mark_as_spam_snippet_path(@snippet), method: :post diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml index 819f02b78fe..77a6ff5455e 100644 --- a/app/views/snippets/show.html.haml +++ b/app/views/snippets/show.html.haml @@ -4,13 +4,7 @@ - breadcrumb_title @snippet.to_reference - page_title "#{@snippet.title} (#{@snippet.to_reference})", _("Snippets") -- if Feature.enabled?(:snippets_vue, default_enabled: true) - #js-snippet-view{ data: {'qa-selector': 'snippet_view', 'snippet-gid': @snippet.to_global_id} } -- else - = render 'shared/snippets/header' - - .personal-snippets - = render 'shared/snippets/blob', blob: @blob +#js-snippet-view{ data: {'qa-selector': 'snippet_view', 'snippet-gid': @snippet.to_global_id} } .row-content-block.top-block.content-component-block = render 'award_emoji/awards_block', awardable: @snippet, inline: true |