diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-18 03:07:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-18 03:07:23 +0000 |
| commit | 962afb3da11a72c7fca322378886b2c0be9f3385 (patch) | |
| tree | 541e08c4d329ab62cfbadde45b0f15d2171e004e /app/views | |
| parent | 8a560d56661f56804ddf6596f928e7d25db37443 (diff) | |
| download | gitlab-ce-master.tar.gz | |
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/spam_logs/_spam_log.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/spam_logs/index.html.haml | 1 | ||||
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_files.html.haml | 3 |
4 files changed, 7 insertions, 1 deletions
diff --git a/app/views/admin/spam_logs/_spam_log.html.haml b/app/views/admin/spam_logs/_spam_log.html.haml index 183667679b9..6aed8508a6a 100644 --- a/app/views/admin/spam_logs/_spam_log.html.haml +++ b/app/views/admin/spam_logs/_spam_log.html.haml @@ -22,6 +22,8 @@ %td = truncate(spam_log.description, length: 100) %td + = moderation_status(user) + %td - if user = render Pajamas::ButtonComponent.new(size: :small, variant: :danger, diff --git a/app/views/admin/spam_logs/index.html.haml b/app/views/admin/spam_logs/index.html.haml index 001662c4015..9a0756510ec 100644 --- a/app/views/admin/spam_logs/index.html.haml +++ b/app/views/admin/spam_logs/index.html.haml @@ -14,6 +14,7 @@ %th= _('Type') %th= _('Title') %th= _('Description') + %th= _('User Status') %th= _('Primary Action') %th = render @spam_logs diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 7f8858411ca..19dc7a1d9b9 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -90,6 +90,8 @@ .form-text.text-muted = s_('Preferences|Choose what content you want to see on a project’s overview page.') .form-group + = f.gitlab_ui_checkbox_component :project_shortcut_buttons, s_('Preferences|Show shortcut buttons above files on project overview') + .form-group = f.gitlab_ui_checkbox_component :render_whitespace_in_code, s_('Preferences|Render whitespace characters in the Web IDE') .form-group = f.gitlab_ui_checkbox_component :show_whitespace_in_diffs, s_('Preferences|Show whitespace changes in diffs') diff --git a/app/views/projects/_files.html.haml b/app/views/projects/_files.html.haml index 5c7f83fc579..60535d704c4 100644 --- a/app/views/projects/_files.html.haml +++ b/app/views/projects/_files.html.haml @@ -2,6 +2,7 @@ - is_project_overview = local_assigns.fetch(:is_project_overview, false) - ref = local_assigns.fetch(:ref) { current_ref } - project = local_assigns.fetch(:project) { @project } +- has_project_shortcut_buttons = !current_user || current_user.project_shortcut_buttons - add_page_startup_api_call logs_file_project_ref_path(@project, ref, @path, format: "json", offset: 0) - if readme_path = @project.repository.readme_path - add_page_startup_api_call project_blob_path(@project, tree_join(@ref, readme_path), viewer: "rich", format: "json") @@ -18,7 +19,7 @@ - if project.forked? #js-fork-info{ data: vue_fork_divergence_data(project, ref) } - - if is_project_overview + - if is_project_overview && has_project_shortcut_buttons .project-buttons.gl-mb-5.js-show-on-project-root{ data: { qa_selector: 'project_buttons' } } = render 'stat_anchor_list', anchors: @project.statistics_buttons(show_auto_devops_callout: show_auto_devops_callout), project_buttons: true |