diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/views/snippets | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/views/snippets')
-rw-r--r-- | app/views/snippets/notes/_actions.html.haml | 2 | ||||
-rw-r--r-- | app/views/snippets/show.html.haml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/views/snippets/notes/_actions.html.haml b/app/views/snippets/notes/_actions.html.haml index 310d9946663..2e94bbe4baf 100644 --- a/app/views/snippets/notes/_actions.html.haml +++ b/app/views/snippets/notes/_actions.html.haml @@ -8,7 +8,7 @@ - if note_editable .note-actions-item - = button_tag title: _('Edit comment'), class: 'note-action-button js-note-edit has-tooltip btn btn-transparent', data: { container: 'body', qa_selector: 'edit_comment_button' } do + = button_tag title: _('Edit comment'), class: 'note-action-button js-note-edit has-tooltip gl-button btn btn-transparent', data: { container: 'body', qa_selector: 'edit_comment_button' } do %span.link-highlight = custom_icon('icon_pencil') diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml index 77a6ff5455e..beb4cf4a6aa 100644 --- a/app/views/snippets/show.html.haml +++ b/app/views/snippets/show.html.haml @@ -1,3 +1,9 @@ +- add_page_startup_graphql_call('snippet/snippet', { ids: [@snippet.to_global_id.uri] }) +- add_page_startup_graphql_call('snippet/snippet_blob_content', { ids: [@snippet.to_global_id.uri], rich: false, paths: [@snippet.file_name] }) +- if @snippet.project_id? + - add_page_startup_graphql_call('snippet/project_permissions', { fullPath: @snippet.project_id }) +- else + - add_page_startup_graphql_call('snippet/user_permissions') - @hide_top_links = true - @content_class = "limit-container-width limited-inner-width-container" unless fluid_layout - add_to_breadcrumbs _("Snippets"), dashboard_snippets_path |