root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2024-07-26 18:12:07 +00:00
parent 328ad15eeb
commit 3e28a87cd5
152 changed files with 672 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/ci/release-environments/main.gitlab-ci.yml
View File

@ -89,7 +89,7 @@ release-environments-qa:
extends:
- .qa-base
timeout: 30m
parallel: 5
parallel: 3
variables:
QA_SCENARIO: "Test::Instance::Smoke"
RELEASE: "${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab-ee-qa:${CI_COMMIT_SHA}"

1
.rubocop_todo/gitlab/bounded_contexts.yml
View File

@ -1378,7 +1378,6 @@ Gitlab/BoundedContexts:
- 'app/policies/list_policy.rb'
- 'app/policies/merge_request_policy.rb'
- 'app/policies/merge_requests_closing_issues_policy.rb'
- 'app/policies/metrics/dashboard/annotation_policy.rb'
- 'app/policies/milestone_policy.rb'
- 'app/policies/namespace/package_setting_policy.rb'
- 'app/policies/namespace/root_storage_statistics_policy.rb'

1
.rubocop_todo/layout/empty_line_after_magic_comment.yml
View File

@ -63,7 +63,6 @@ Layout/EmptyLineAfterMagicComment:
- 'app/policies/dependency_proxy/group_setting_policy.rb'
- 'app/policies/dependency_proxy/image_ttl_group_policy_policy.rb'
- 'app/policies/dependency_proxy/manifest_policy.rb'
- 'app/policies/metrics/dashboard/annotation_policy.rb'
- 'app/policies/packages/composer/metadatum_policy.rb'
- 'app/policies/packages/conan/file_metadatum_policy.rb'
- 'app/policies/packages/conan/metadatum_policy.rb'

1
.rubocop_todo/style/inline_disable_annotation.yml
View File

@ -1702,7 +1702,6 @@ Style/InlineDisableAnnotation:
- 'ee/lib/ee/users/internal.rb'
- 'ee/lib/elastic/instance_proxy_util.rb'
- 'ee/lib/elastic/latest/git_class_proxy.rb'
- 'ee/lib/elastic/latest/issue_class_proxy.rb'
- 'ee/lib/elastic/latest/note_class_proxy.rb'
- 'ee/lib/elastic/latest/project_class_proxy.rb'
- 'ee/lib/elastic/latest/user_class_proxy.rb'

2
.ruby-version
View File

@ -1 +1 @@
3.2.3
3.2.4

4
Gemfile
View File

@ -589,7 +589,7 @@ gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :sh
gem 'email_reply_trimmer', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'html2text' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'stackprof', '~> 0.2.25', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared
gem 'rbtrace', '~> 0.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'memory_profiler', '~> 1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'activerecord-explain-analyze', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
@ -614,7 +614,7 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 17.1.0', feature_category: :gitaly
gem 'gitaly', '~> 17.2.0', feature_category: :gitaly
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management

4
Gemfile.checksum
View File

@ -206,7 +206,7 @@
{"name":"gettext","version":"3.4.9","platform":"ruby","checksum":"292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a"},
{"name":"gettext_i18n_rails","version":"1.12.0","platform":"ruby","checksum":"6ac4817731a9e2ce47e1e83381ac34f9142263bc2911aaaafb2526d2f1afc1be"},
{"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"},
{"name":"gitaly","version":"17.1.2","platform":"ruby","checksum":"def450eec7243770cba6f874502dcde470338968a724f1b86efd62a8caea2c5f"},
{"name":"gitaly","version":"17.2.0","platform":"ruby","checksum":"48eee8883c43bb2f8fedbb43e4543439cfe37c33becebaec9ea1d425f9cce865"},
{"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
{"name":"gitlab-chronic","version":"0.10.5","platform":"ruby","checksum":"f80f18dc699b708870a80685243331290bc10cfeedb6b99c92219722f729c875"},
{"name":"gitlab-dangerfiles","version":"4.8.0","platform":"ruby","checksum":"b327d079552ec974a63bf34d749a0308425af6ebf51d01064f1a6ff216a523db"},
@ -678,7 +678,7 @@
{"name":"sprockets-rails","version":"3.5.1","platform":"ruby","checksum":"c44626cb3887a1a8b572ca258685db33b4ebd041aa73428a716eac444ee5ef48"},
{"name":"ssh_data","version":"1.3.0","platform":"ruby","checksum":"ec7c1e95a3aebeee412147998f4c147b4b05da6ed0aafda6083f9449318eaac0"},
{"name":"ssrf_filter","version":"1.0.8","platform":"ruby","checksum":"03f49f54837e407d43ee93ec733a8a94dc1bcf8185647ac61606e63aaedaa0db"},
{"name":"stackprof","version":"0.2.25","platform":"ruby","checksum":"28db0e2d22b817ae35def7163822505a04a026b02ef119b6aa89d70b967b0d2e"},
{"name":"stackprof","version":"0.2.26","platform":"ruby","checksum":"ee408cbcccd9422aabd66edff8b76a77d67955f2ee1b674961b5dfaa2cc7b8bd"},
{"name":"state_machines","version":"0.5.0","platform":"ruby","checksum":"23e6249d374a920b528dccade403518b4abbd83841a3e2c9ef13e6f1a009b102"},
{"name":"state_machines-activemodel","version":"0.8.0","platform":"ruby","checksum":"e932dab190d4be044fb5f9cab01a3ea0b092c5f113d4676c6c0a0d49bf738d2c"},
{"name":"state_machines-activerecord","version":"0.8.0","platform":"ruby","checksum":"072fb701b8ab03de0608297f6c55dc34ed096e556fa8f77e556f3c461c71aab6"},

8
Gemfile.lock
View File

@ -692,7 +692,7 @@ GEM
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
gitaly (17.1.2)
gitaly (17.2.0)
grpc (~> 1.0)
gitlab (4.19.0)
httparty (~> 0.20)
@ -1747,7 +1747,7 @@ GEM
sprockets (>= 3.0.0)
ssh_data (1.3.0)
ssrf_filter (1.0.8)
stackprof (0.2.25)
stackprof (0.2.26)
state_machines (0.5.0)
state_machines-activemodel (0.8.0)
activemodel (>= 5.1)
@ -2022,7 +2022,7 @@ DEPENDENCIES
gdk-toogle (~> 0.9, >= 0.9.5)
gettext (~> 3.4, >= 3.4.9)
gettext_i18n_rails (~> 1.12.0)
gitaly (~> 17.1.0)
gitaly (~> 17.2.0)
gitlab-backup-cli!
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 4.8.0)
@ -2257,7 +2257,7 @@ DEPENDENCIES
sprockets (~> 3.7.0)
sprockets-rails (~> 3.5.1)
ssh_data (~> 1.3)
stackprof (~> 0.2.25)
stackprof (~> 0.2.26)
state_machines-activerecord (~> 0.8.0)
static_holmes (~> 0.7.11)
sys-filesystem (~> 1.4.3)

4
app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue
View File

@ -12,7 +12,7 @@ import {
export default {
i18n: {
browseCatalog: __('Browse CI/CD Catalog'),
browseCatalog: __('CI/CD Catalog'),
help: __('Help'),
jobAssistant: s__('JobAssistant|Job assistant'),
},
@ -67,7 +67,7 @@ export default {
<gl-button
:href="ciCatalogPath"
size="small"
icon="external-link"
icon="catalog-checkmark"
target="_blank"
data-testid="catalog-repo-link"
@click="trackCatalogBrowsing"

2
app/assets/javascripts/diffs/components/file_row_stats.vue
View File

@ -12,7 +12,7 @@ export default {
<template>
<span class="file-row-stats">
<span class="cgreen"> +{{ file.addedLines }} </span>
<span class="cred"> -{{ file.removedLines }} </span>
<span data-testid="file-removed-lines" class="gl-text-red-500"> -{{ file.removedLines }} </span>
</span>
</template>

9
app/assets/javascripts/diffs/store/actions.js
View File

@ -10,7 +10,12 @@ import axios from '~/lib/utils/axios_utils';
import { HTTP_STATUS_NOT_FOUND, HTTP_STATUS_OK } from '~/lib/utils/http_status';
import Poll from '~/lib/utils/poll';
import { mergeUrlParams, getLocationHash, getParameterValues } from '~/lib/utils/url_utility';
import {
mergeUrlParams,
getLocationHash,
getParameterValues,
removeParams,
} from '~/lib/utils/url_utility';
import notesEventHub from '~/notes/event_hub';
import { generateTreeList } from '~/diffs/utils/tree_worker_utils';
import { sortTree } from '~/ide/stores/utils';
@ -394,7 +399,7 @@ export const fetchCoverageFiles = ({ commit, state }) => {
export const setHighlightedRow = ({ commit }, { lineCode, event }) => {
if (event && event.target.href) {
event.preventDefault();
window.history.replaceState(null, undefined, event.target.href);
window.history.replaceState(null, undefined, removeParams(['pin'], event.target.href));
}
const fileHash = lineCode.split('_')[0];
commit(types.SET_HIGHLIGHTED_ROW, lineCode);

2
app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue
View File

@ -100,7 +100,7 @@ export default {
<div data-testid="conflicts-count">
<gl-sprintf :message="$options.i18n.commitStatSummary">
<template #conflict>
<strong class="cred">{{ getConflictsCountText }}</strong>
<strong class="gl-text-danger">{{ getConflictsCountText }}</strong>
</template>
<template #sourceBranch>
<strong class="ref-name">{{ conflictsData.sourceBranch }}</strong>

4
app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
View File

@ -175,11 +175,11 @@ export default {
<gl-alert
v-if="noDataAvailable"
variant="info"
:title="s__('Code Coverage| Empty code coverage data')"
:title="s__('Code Coverage|No code coverage data')"
:dismissible="false"
>
<span>
{{ __('It seems that there is currently no available data for code coverage') }}
{{ __('Code coverage results are not yet available. Try again later.') }}
</span>
</gl-alert>
<gl-collapsible-listbox

5
app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
View File

@ -186,9 +186,8 @@ export default {
});
},
issuesHelpPagePath() {
// eslint-disable-next-line local-rules/require-valid-help-page-path
return helpPagePath('user/project/settings/index.md', {
anchor: 'configure-project-visibility-features-and-permissions',
return helpPagePath('user/project/settings/index', {
anchor: 'configure-project-features-and-permissions',
});
},
areTicketsConfidentialByDefaultHelp() {

2
app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue
View File

@ -43,6 +43,6 @@ export default {
data-track-action="open_review_app"
data-track-label="review_app"
>
{{ display.text }} <gl-icon class="fgray" name="external-link" />
{{ display.text }} <gl-icon class="gl-fill-gray-500" name="external-link" />
</gl-button>
</template>

2
app/assets/javascripts/vue_shared/components/file_finder/item.vue
View File

@ -106,7 +106,7 @@ export default {
<span class="cgreen bold">
<gl-icon name="file-addition" class="align-text-top" /> {{ file.addedLines }}
</span>
<span class="cred bold ml-1">
<span class="gl-text-red-500 bold ml-1">
<gl-icon name="file-deletion" class="align-text-top" /> {{ file.removedLines }}
</span>
</span>

4
app/assets/stylesheets/framework/common.scss
View File

@ -72,13 +72,9 @@
/** COLORS **/
.cgray { color: $gl-text-color; }
.clgray { color: $gray-200; }
.cred { color: $red-500; }
.cgreen { color: $green-600; }
.cdark { color: $gray-800; }
.fwhite { fill: $white; }
.fgray { fill: $gray-500; }
.text-plain,
.text-plain:hover {
color: $gl-text-color;

9
app/policies/metrics/dashboard/annotation_policy.rb
View File

@ -1,9 +0,0 @@
# frozen_string_literal: true
module Metrics
module Dashboard
class AnnotationPolicy < BasePolicy
delegate { @subject.cluster }
delegate { @subject.environment }
end
end
end

2
app/views/admin/health_check/show.html.haml
View File

@ -32,7 +32,7 @@
= sprite_icon('check', css_class: 'cgreen')
#{ s_('HealthCheck|Healthy') }
- else
= sprite_icon('warning-solid', css_class: 'cred')
= sprite_icon('warning-solid', css_class: 'gl-text-danger')
#{ s_('HealthCheck|Unhealthy') }
- c.with_body do
- if no_errors

4
app/views/admin/projects/show.html.haml
View File

@ -111,7 +111,7 @@
%li{ class: 'gl-px-5!' }
%span.light
= _('repository:')
%strong.cred
%strong.gl-text-danger
= _('does not exist')
- if @project.archived?
@ -155,7 +155,7 @@
= _("This repository has never been checked.")
- elsif @project.last_repository_check_failed?
- failed_message = _("This repository was last checked %{last_check_timestamp}. The check %{strong_start}failed.%{strong_end} See the 'repocheck.log' file for error messages.")
- failed_message = failed_message % { last_check_timestamp: @project.last_repository_check_at.to_fs(:medium), strong_start: "<strong class='cred'>", strong_end: "</strong>" }
- failed_message = failed_message % { last_check_timestamp: @project.last_repository_check_at.to_fs(:medium), strong_start: "<strong class='gl-text-danger'>", strong_end: "</strong>" }
= failed_message.html_safe
- else
= _("This repository was last checked %{last_check_timestamp}. The check passed.") % { last_check_timestamp: @project.last_repository_check_at.to_fs(:medium) }

4
app/views/admin/users/show.html.haml
View File

@ -61,7 +61,7 @@
%li.two-factor-status{ class: list_item_classes }
%span.gl-text-secondary= _('Two-factor Authentication:')
.gl-col-span-2
%strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'cred' }
%strong{ class: @user.two_factor_enabled? ? 'cgreen' : 'gl-text-danger' }
- if @user.two_factor_enabled?
= _('Enabled')
= link_button_to _('Disable'), disable_two_factor_admin_user_path(@user), aria: { label: _('Disable') }, data: { confirm: _('Are you sure?'), 'confirm-btn-variant': 'danger' }, method: :patch, class: 'gl-float-right', title: _('Disable Two-factor Authentication'), variant: :danger, size: :small
@ -103,7 +103,7 @@
%li{ class: list_item_classes }
%span.gl-text-secondary= _('Confirmed:')
.gl-col-span-2
%strong.cred= _('No')
%strong.gl-text-danger= _('No')
%li{ class: list_item_classes }
%span.gl-text-secondary= _('Current sign-in IP:')

7
app/views/notify/prometheus_alert_fired_email.html.haml
View File

@ -15,13 +15,6 @@
= _('Environment:')
= env_name
- if metric_query = @alert.prometheus_alert&.full_query
%p
= _('Metric:')
%pre
= metric_query
- if @alert.show_incident_issues_link?
%p
= link_to(_('View incident issues.'), @alert.incident_issues_link)

4
app/views/notify/prometheus_alert_fired_email.text.erb
View File

@ -11,10 +11,6 @@
<%= _('Environment:') %> <%= env_name %>
<% end %>
<% if metric_query = @alert.prometheus_alert&.full_query %>
<%= _('Metric:') %> <%= metric_query %>
<% end %>
<% if @alert.show_incident_issues_link? %>
<%= _('View incident issues.') %> <%= @alert.incident_issues_link %>
<% end %>

2
app/views/projects/_issue.html.haml
View File

@ -30,7 +30,7 @@
= sprite_icon('milestone', css_class: 'gl-vertical-align-text-bottom')
= issue.milestone.title
- if issue.due_date
%span.issuable-due-date.gl-hidden.sm:gl-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue? && !issue.closed?}", title: _('Due date') }
%span.issuable-due-date.gl-hidden.sm:gl-inline-block.has-tooltip{ class: "#{'gl-text-danger' if issue.overdue? && !issue.closed?}", title: _('Due date') }
&nbsp;
= sprite_icon('calendar')
= issue.due_date.to_fs(:medium)

5
app/views/projects/artifacts/file.html.haml
View File

@ -1,8 +1,13 @@
- breadcrumb_title _('Artifacts')
- @breadcrumb_link = browse_project_job_artifacts_path(@project, @build)
- page_title @path, _('Artifacts'), "#{@build.name} (##{@build.id})", _('Jobs')
- add_page_specific_style 'page_bundles/tree'
= render "projects/jobs/header"
- add_to_breadcrumbs(s_('CICD|Jobs'), project_jobs_path(@project))
- add_to_breadcrumbs("##{@build.id}", project_job_path(@project, @build))
.tree-holder
= render 'projects/artifacts/file_navigation', project: @project, build: @build, path: @path

2
app/views/projects/commit/x509/_certificate_details.html.haml
View File

@ -2,7 +2,7 @@
.gpg-popover-certificate-details
%strong= _('Certificate Subject')
- if signature.x509_certificate.revoked?
%strong.cred= _('(revoked)')
%strong.gl-text-danger= _('(revoked)')
%ul
- x509_subject(signature.x509_certificate.subject, ["CN", "O"]).map do |key, value|
%li= key + "=" + value

1
app/views/projects/merge_requests/_nav_btns.html.haml
View File

@ -1,3 +1,4 @@
= render_if_exists 'projects/merge_requests/merge_trains_button'
- if @can_bulk_update
= render Pajamas::ButtonComponent.new(type: :submit, button_options: { class: 'gl-mr-3 js-bulk-update-toggle' }) do
= _("Bulk edit")

2
app/views/projects/merge_requests/_page.html.haml
View File

@ -107,7 +107,7 @@
#js-review-bar{ data: review_bar_data(@merge_request, current_user) }
- if Feature.enabled?(:reviewer_assign_drawer, current_user, type: :wip)
- if Feature.enabled?(:reviewer_assign_drawer, current_user, type: :beta)
#js-reviewer-drawer-portal
- if current_user && Feature.enabled?(:mr_experience_survey, current_user)

2
app/views/shared/notes/_note.html.haml
View File

@ -80,4 +80,4 @@
= note.attachment_identifier
= link_to delete_attachment_project_note_path(note.project, note),
title: _('Delete this attachment'), method: :delete, remote: true, data: { confirm: _('Are you sure you want to remove the attachment?') }, class: 'danger js-note-attachment-delete' do
= sprite_icon('remove', css_class: 'cred')
= sprite_icon('remove', css_class: 'gl-text-danger')

22
app/views/users/_profile_sidebar.html.haml
View File

@ -30,21 +30,21 @@
%h2.gl-font-base.gl-mb-2.gl-mt-4= s_('UserProfile|Info')
- if work_information(@user).present?
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('work', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('work', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
%span
= work_information(@user, with_schema_markup: true)
- if @user.location.present?
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('location', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('location', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
%span{ itemprop: 'addressLocality' }
= @user.location
- if user_local_time.present?
.gl-display-flex.gl-gap-2.gl-mb-2{ data: { testid: 'user-local-time' } }
= sprite_icon('clock', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('clock', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
%span
= user_local_time
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('calendar', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('calendar', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
%span= s_('Member since %{date}') % { date: l(@user.created_at.to_date, format: :long) }
- if @user.website_url.present? || display_public_email?(@user) || @user.skype.present? || @user.linkedin.present? || @user.twitter.present? || @user.mastodon.present? || @user.discord.present?
@ -52,29 +52,29 @@
%h2.gl-font-base.gl-mb-2.gl-mt-4= s_('UserProfile|Contact')
- if @user.website_url.present?
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('earth', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('earth', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
= link_to @user.short_website_url, @user.full_website_url, class: 'gl-text-gray-900', target: '_blank', rel: 'me noopener noreferrer nofollow', itemprop: 'url'
- if display_public_email?(@user)
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('mail', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('mail', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
= link_to @user.public_email, "mailto:#{@user.public_email}", class: 'gl-text-gray-900', itemprop: 'email'
- if @user.skype.present?
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('skype', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('skype', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
= link_to @user.skype, "skype:#{@user.skype}", class: 'gl-text-gray-900', title: "Skype"
- if @user.linkedin.present?
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('linkedin', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('linkedin', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
= link_to linkedin_name(@user), linkedin_url(@user), class: 'gl-text-gray-900', title: "LinkedIn", target: '_blank', rel: 'noopener noreferrer nofollow'
- if @user.twitter.present?
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('x', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('x', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
= link_to @user.twitter, twitter_url(@user), class: 'gl-text-gray-900', title: _("X (formerly Twitter)"), target: '_blank', rel: 'noopener noreferrer nofollow'
- if @user.mastodon.present?
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('mastodon', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('mastodon', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
= link_to @user.mastodon, mastodon_url(@user), class: 'gl-text-gray-900', title: "Mastodon", target: '_blank', rel: 'noopener noreferrer nofollow'
- if @user.discord.present?
.gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('discord', css_class: 'fgray gl-mt-1 flex-shrink-0')
= sprite_icon('discord', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0')
= link_to @user.discord, discord_url(@user), class: 'gl-text-gray-900', title: "Discord", target: '_blank', rel: 'noopener noreferrer nofollow'

4
config/feature_flags/wip/reviewer_assign_drawer.yml → config/feature_flags/beta/reviewer_assign_drawer.yml
View File

@ -2,8 +2,8 @@
name: reviewer_assign_drawer
feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/448423
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147825
rollout_issue_url:
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/467205
milestone: '16.11'
group: group::code review
type: wip
type: beta
default_enabled: false

2
data/deprecations/15-9-deprecate-option-to-remove-project-immediately.yml
View File

@ -6,7 +6,7 @@
stage: manage # (required) String value of the stage that the feature was created in. e.g., Growth
issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389557 # (required) Link to the deprecation issue in GitLab
body: | # (required) Do not modify this line, instead modify the lines below.
The group and project deletion protection setting in the Admin area had an option to delete groups and projects immediately. Starting with 16.0, this option will no longer be available, and delayed group and project deletion will become the default behavior.
The group and project deletion protection setting in the **Admin** area had an option to delete groups and projects immediately. Starting with 16.0, this option will no longer be available, and delayed group and project deletion will become the default behavior.
The option will no longer appear as a group setting. Self-managed users will still have the option to define the deletion delay period, and SaaS users have a non-adjustable default retention period of 7 days. Users can still immediately delete the project from the project settings, and the group from the group settings.

29
doc/administration/admin_area.md
View File

@ -10,10 +10,11 @@ DETAILS:
**Tier:** Free, Premium, Ultimate
**Offering:** Self-managed, GitLab Dedicated
The Admin area provides a web UI to manage and configure features of GitLab
self-managed instances. If you are an administrator, to access the Admin area:
The **Admin** area provides a web UI to manage and configure features of GitLab
self-managed instances. If you are an administrator, to access the **Admin** area:
- In GitLab 16.7 and later: on the left sidebar, at the bottom, select **Admin**.
- In GitLab 17.3 and later: on the left sidebar, at the bottom, select **Admin**.
- In GitLab 16.7 and later: on the left sidebar, at the bottom, select **Admin area**.
- In GitLab 16.1 and later: on the left sidebar, select **Search or go to**, then select **Admin**.
- In GitLab 16.0 and earlier: on the top bar, select **Main menu > Admin**.
@ -21,7 +22,7 @@ If the GitLab instance uses Admin Mode, you must [enable Admin Mode for your ses
the **Admin** button is visible.
NOTE:
Only administrators on GitLab self-managed or GitLab Dedicated can access the Admin area. On GitLab.com the Admin area feature is not available.
Only administrators on GitLab self-managed or GitLab Dedicated can access the **Admin** area. On GitLab.com the **Admin** area feature is not available.
## Administering organizations
@ -32,7 +33,7 @@ On self-managed GitLab, by default this feature is not available. To make it ava
On GitLab.com and GitLab Dedicated, this feature is not available.
This feature is not ready for production use.
You can administer all organizations in the GitLab instance from the Admin area's Organizations page.
You can administer all organizations in the GitLab instance from the **Admin** area's Organizations page.
To access the Organizations page:
@ -41,7 +42,7 @@ To access the Organizations page:
## Administering projects
You can administer all projects in the GitLab instance from the Admin area's Projects page.
You can administer all projects in the GitLab instance from the **Admin** area's Projects page.
To access the Projects page:
@ -96,7 +97,7 @@ You can combine the filter options. For example, to list only public projects wi
> - Filtering users [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/238183) in GitLab 17.0.
You can administer all users in the GitLab instance from the Admin area's Users page:
You can administer all users in the GitLab instance from the **Admin** area's Users page:
1. On the left sidebar, at the bottom, select **Admin**.
1. Select **Overview > Users**.
@ -168,7 +169,7 @@ DETAILS:
**Tier:** Premium, Ultimate
**Offering:** Self-managed, GitLab Dedicated
An administrator can export user permissions for all users in the GitLab instance from the Admin area's Users page.
An administrator can export user permissions for all users in the GitLab instance from the **Admin** area's Users page.
The export lists direct membership the users have in groups and projects.
The following data is included in the export:
@ -228,7 +229,7 @@ It is also possible to [limit which roles can create a subgroup within a group](
## Administering groups
You can administer all groups in the GitLab instance from the Admin area's Groups page.
You can administer all groups in the GitLab instance from the **Admin** area's Groups page.
To access the Groups page:
@ -323,7 +324,7 @@ To merge topics:
## Administering Gitaly servers
You can list all Gitaly servers in the GitLab instance from the Admin area's **Gitaly servers**
You can list all Gitaly servers in the GitLab instance from the **Admin** area's **Gitaly servers**
page. For more details, see [Gitaly](gitaly/index.md).
To access the **Gitaly servers** page:
@ -347,7 +348,7 @@ For each Gitaly server, the following details are listed:
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/340859) from **Overview > Runners** to **CI/CD > Runners** in GitLab 15.8.
You can administer all runners in the GitLab instance from the Admin area's **Runners** page. See
You can administer all runners in the GitLab instance from the **Admin** area's **Runners** page. See
[GitLab Runner](https://docs.gitlab.com/runner/) for more information.
To access the **Runners** page:
@ -404,7 +405,7 @@ You can also edit, pause, or remove each runner.
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/386311) from **Overview > Jobs** to **CI/CD > Jobs** in GitLab 15.8.
You can administer all jobs in the GitLab instance from the Admin area's Jobs page.
You can administer all jobs in the GitLab instance from the **Admin** area's Jobs page.
To access the Jobs page:
@ -429,7 +430,7 @@ For each job, the following details are listed:
## Monitoring section
The following topics document the **Monitoring** section of the Admin area.
The following topics document the **Monitoring** section of the **Admin** area.
### System information
@ -466,7 +467,7 @@ The Sidekiq dashboard consists of the following elements:
### Logs
**Log** view has been removed from the Admin area dashboard since the logging does not work in multi-node setups and could cause confusion for administrators by displaying partial information.
**Log** view has been removed from the **Admin** area dashboard since the logging does not work in multi-node setups and could cause confusion for administrators by displaying partial information.
For multi-node systems we recommend ingesting the logs into services like Elasticsearch and Splunk.

6
doc/administration/auditor_users.md
View File

@ -12,7 +12,7 @@ DETAILS:
Users with auditor access have read-only access to all groups, projects, and other resources except:
- The [Admin area](../administration/admin_area.md).
- The [**Admin** area](../administration/admin_area.md).
- Project and group settings.
For more information, see [Auditor user permissions and restrictions](#auditor-user-permissions-and-restrictions)
@ -49,7 +49,7 @@ You can also give users auditor access using [SAML groups](../integration/saml.m
## Auditor user permissions and restrictions
Auditor access is _not_ a read-only version of administrator access because it doesn't permit access to the Admin area.
Auditor access is _not_ a read-only version of administrator access because it doesn't permit access to the **Admin** area.
For access to their own resources and resources within a group or project where they are a member,
users with auditor access have the same [permissions](../user/permissions.md) as regular users.
@ -61,7 +61,7 @@ If you are signed in with auditor access, you:
- Have [permissions](../user/permissions.md) based on your role to projects and groups you are a member of. For example, if you have the Developer role,
you can push commits or comment on issues.
- Can access the same resources using the GitLab UI or API.
- Can't view the Admin area, or perform any administration actions.
- Can't view the **Admin** area, or perform any administration actions.
- Can't view job logs when [debug logging](../ci/variables/index.md#enable-debug-logging) is enabled.
## Maintain auditor users using API

2
doc/administration/cicd.md
View File

@ -175,7 +175,7 @@ in GitLab 18.0. Runner authentication tokens should be used instead. For more in
Prerequisites:
- Runner registration tokens must be [enabled](../administration/settings/continuous_integration.md#enable-runner-registrations-tokens) in the Admin area.
- Runner registration tokens must be [enabled](../administration/settings/continuous_integration.md#enable-runner-registrations-tokens) in the **Admin** area.
```ruby
Gitlab::CurrentSettings.current_application_settings.runners_registration_token

2
doc/administration/dedicated/configure_instance.md
View File

@ -13,7 +13,7 @@ DETAILS:
The instructions on this page guide you through configuring your GitLab Dedicated instance, including enabling and updating the settings for [available functionality](../../subscriptions/gitlab_dedicated/index.md#available-features).
Any functionality in the GitLab application that is not controlled by the SaaS environment can be configured by using the [Admin area](../../administration/admin_area.md).
Any functionality in the GitLab application that is not controlled by the SaaS environment can be configured by using the [**Admin** area](../../administration/admin_area.md).
Examples of SaaS environment settings include `gitlab.rb` configurations and access to shell, Rails console, and PostgreSQL console.
These environment settings cannot be changed by tenants.

2
doc/administration/geo/index.md
View File

@ -166,7 +166,7 @@ If you are only using `HTTPS` for external/internal URLs, it is not necessary to
#### Internal URL
HTTP requests from any Geo secondary site to the primary Geo site use the Internal URL of the primary
Geo site. If this is not explicitly defined in the primary Geo site settings in the Admin area, the
Geo site. If this is not explicitly defined in the primary Geo site settings in the **Admin** area, the
public URL of the primary site is used.
To update the internal URL of the primary Geo site:

2
doc/administration/geo/replication/datatypes.md
View File

@ -95,7 +95,7 @@ The Gitaly gRPC API does the communication, with three possible ways of synchron
- Using regular Git clone/fetch from one Geo site to another (with special authentication).
- Using repository snapshots (for when the first method fails or repository is corrupt).
- Manual trigger from the Admin area (a combination of both of the above).
- Manual trigger from the **Admin** area (a combination of both of the above).
Each project can have at most 3 different repositories:

4
doc/administration/geo/replication/troubleshooting/client_http.md
View File

@ -74,7 +74,7 @@ To resolve this issue:
If you still get this error, you can further increase the buffer size by repeating the steps above
and changing the `8k` size, for example by doubling it to `16k`.
### Geo Admin area shows 'Unknown' for health status and 'Request failed with status code 401'
### Geo Admin area shows `Unknown` for health status and 'Request failed with status code 401'
If using a load balancer, ensure that the load balancer's URL is set as the `external_url` in the
`/etc/gitlab/gitlab.rb` of the nodes behind the load balancer.
@ -142,7 +142,7 @@ You can have only one wildcard domain in the `no_proxy` list.
### Geo Admin area returns 404 error for a secondary site
Sometimes `sudo gitlab-rake gitlab:geo:check` indicates that **Rails nodes of the secondary** sites are
healthy, but a 404 Not Found error message for the **secondary** site is returned in the Geo Admin area on the web interface for
healthy, but a 404 Not Found error message for the **secondary** site is returned in the Geo **Admin** area on the web interface for
the **primary** site.
To resolve this issue:

8
doc/administration/geo/replication/troubleshooting/common.md
View File

@ -282,9 +282,9 @@ sudo gitlab-rake gitlab:geo:check
Checking Geo ... Finished
```
Ensure you have added the secondary site in the Admin area under **Geo > Sites** on the web interface for the **primary** site.
Ensure you have added the secondary site in the **Admin** area under **Geo > Sites** on the web interface for the **primary** site.
Also ensure you entered the `gitlab_rails['geo_node_name']`
when adding the secondary site in the Admin area of the **primary** site.
when adding the secondary site in the **Admin** area of the **primary** site.
- Check returns `Exception: PG::UndefinedTable: ERROR: relation "geo_nodes" does not exist`.
@ -457,7 +457,7 @@ This machine's Geo node name matches a database record ... no
```
For more information about recommended site names in the description of the Name field, see
[Geo Admin area Common Settings](../../../../administration/geo_sites.md#common-settings).
[Geo **Admin** area Common Settings](../../../../administration/geo_sites.md#common-settings).
### Check OS locale data compatibility
@ -472,7 +472,7 @@ See the [PostgreSQL wiki for more details](https://wiki.postgresql.org/wiki/Loca
## Fixing common errors
This section documents common error messages reported in the Admin area on the web interface, and how to fix them.
This section documents common error messages reported in the **Admin** area on the web interface, and how to fix them.
### Geo database configuration file is missing

2
doc/administration/geo/replication/troubleshooting/replication.md
View File

@ -353,7 +353,7 @@ to enact the following, basic troubleshooting steps:
#### Resync and reverify multiple components
NOTE:
There is an [issue to implement this functionality in the Admin area UI](https://gitlab.com/gitlab-org/gitlab/-/issues/364729).
There is an [issue to implement this functionality in the **Admin** area UI](https://gitlab.com/gitlab-org/gitlab/-/issues/364729).
WARNING:
Commands that change data can cause damage if not run correctly or under the right conditions. Always run commands in a test environment first and have a backup instance ready to restore.

2
doc/administration/geo/replication/troubleshooting/synchronization.md
View File

@ -57,7 +57,7 @@ You can perform a similar operation with other the Models handled by the [Geo Se
NOTE:
`GroupWikiRepository` is not in the previous list since verification is not implemented.
There is an [issue to implement this functionality in the Admin area UI](https://gitlab.com/gitlab-org/gitlab/-/issues/364729).
There is an [issue to implement this functionality in the **Admin** area UI](https://gitlab.com/gitlab-org/gitlab/-/issues/364729).
## Message: `Synchronization failed - Error syncing repository`

2
doc/administration/geo/secondary_proxy/runners.md
View File

@ -57,7 +57,7 @@ If you are not concerned about these issues, there is nothing to do here.
You must have administrator access to use any of the following methods:
- Through the Admin area:
- Through the **Admin** area:
1. On the left sidebar, at the bottom, select **Admin**.
1. Select **Settings > Runners**.
1. Identify the runners you would like to pause.

2
doc/administration/geo/setup/two_single_node_external_services.md
View File

@ -283,7 +283,7 @@ Fast lookup is [required for Geo](../../operations/fast_ssh_key_lookup.md#fast-l
NOTE:
Authentication is handled by the primary site. Don't set up custom authentication for the secondary site.
Any change that requires access to the Admin area should be made in the primary site, because the
Any change that requires access to the **Admin** area should be made in the primary site, because the
secondary site is a read-only copy.
#### Add the secondary site

2
doc/administration/geo/setup/two_single_node_sites.md
View File

@ -403,7 +403,7 @@ Fast lookup is [required for Geo](../../operations/fast_ssh_key_lookup.md#fast-l
NOTE:
Authentication is handled by the primary site. Don't set up custom authentication for the secondary site.
Any change that requires access to the Admin area should be made in the primary site, because the
Any change that requires access to the **Admin** area should be made in the primary site, because the
secondary site is a read-only copy.
### Manually replicate secret GitLab values

2
doc/administration/geo_sites.md
View File

@ -79,7 +79,7 @@ The internal URL defaults to external URL. To change it:
1. Edit the internal URL.
1. Select **Save changes**.
When enabled, the Admin area for Geo shows replication details for each site directly
When enabled, the **Admin** area for Geo shows replication details for each site directly
from the primary site's UI, and through the Geo secondary proxy, if enabled.
WARNING:

4
doc/administration/get_started.md
View File

@ -249,7 +249,7 @@ Rate limits also improve the security of your application.
### Configure rate limits for self-managed GitLab
You can make changes to your default rate limits from the Admin area. For more information about configuration, see the [Admin area page](../security/rate_limits.md#configurable-limits).
You can make changes to your default rate limits from the **Admin** area. For more information about configuration, see the [**Admin** area page](../security/rate_limits.md#configurable-limits).
- Define [issues rate limits](settings/rate_limit_on_issues_creation.md) to set a maximum number of issue creation requests per minute, per user.
- Enforce [user and IP rate limits](settings/user_and_ip_rate_limits.md) for unauthenticated web requests.
@ -267,7 +267,7 @@ Rate limits also improve the security of your application.
### Configure rate limits for GitLab SaaS
You can make changes to your default rate limits from the Admin area. For more information about configuration, see the [Admin area page](../security/rate_limits.md#configurable-limits).
You can make changes to your default rate limits from the **Admin** area. For more information about configuration, see the [**Admin** area page](../security/rate_limits.md#configurable-limits).
- Review the rate limit page.
- Read our [API page](../api/rest/index.md) for more information about API and rate limiting.

2
doc/administration/gitaly/configure_gitaly.md
View File

@ -531,7 +531,7 @@ reconfigure the GitLab application servers to remove the `default` entry from `g
To work around the limitation:
1. Define an additional storage location on the new Gitaly service and configure the additional storage to be `default`.
1. In the [Admin area](../repository_storage_paths.md#configure-where-new-repositories-are-stored), set `default` to a weight of zero
1. In the [**Admin** area](../repository_storage_paths.md#configure-where-new-repositories-are-stored), set `default` to a weight of zero
to prevent repositories being stored there.
### Disable Gitaly where not required (optional)

4
doc/administration/instance_limits.md
View File

@ -665,7 +665,7 @@ The total number of custom domains per GitLab Pages website is limited to `150`
The default limit for [GitLab self-managed](../subscriptions/self_managed/index.md) is `0` (unlimited).
To set a limit on your self-managed instance, use the
[Admin area](pages/index.md#set-maximum-number-of-gitlab-pages-custom-domains-for-a-project).
[**Admin** area](pages/index.md#set-maximum-number-of-gitlab-pages-custom-domains-for-a-project).
### Number of extra Pages deployments when using multiple deployments
@ -1037,7 +1037,7 @@ The default maximum file size for a package that's uploaded to the [GitLab packa
The [maximum file sizes on GitLab.com](../user/gitlab_com/index.md#package-registry-limits)
might be different.
To set these limits for a self-managed installation, you can do it [through the Admin area](settings/continuous_integration.md#package-file-size-limits)
To set these limits for a self-managed installation, you can do it [through the **Admin** area](settings/continuous_integration.md#package-file-size-limits)
or run the following in the
[GitLab Rails console](operations/rails_console.md#starting-a-rails-console-session):

2
doc/administration/integration/kroki.md
View File

@ -15,7 +15,7 @@ you can create diagrams-as-code within AsciiDoc, Markdown, reStructuredText, and
## Enable Kroki in GitLab
You need to enable Kroki integration from Settings under Admin area.
You need to enable Kroki integration from Settings under **Admin** area.
To do that, sign in with an administrator account and follow these steps:
1. On the left sidebar, at the bottom, select **Admin**.

4
doc/administration/job_artifacts.md
View File

@ -382,13 +382,13 @@ To change the default schedule on which expired artifacts are deleted:
## Set the maximum file size of the artifacts
If artifacts are enabled, you can change the maximum file size of the
artifacts through the [Admin area settings](../administration/settings/continuous_integration.md#maximum-artifacts-size).
artifacts through the [**Admin** area settings](../administration/settings/continuous_integration.md#maximum-artifacts-size).
## Storage statistics
You can see the total storage used for job artifacts for groups and projects in:
- The Admin area
- The **Admin** area
- The [groups](../api/groups.md) and [projects](../api/projects.md) APIs
## Implementation details

4
doc/administration/labels.md
View File

@ -17,9 +17,9 @@ To manage labels for the GitLab instance:
For more details on how to manage labels, see [Labels](../user/project/labels.md).
Labels created in the Admin area are automatically added to new projects.
Labels created in the **Admin** area are automatically added to new projects.
They are not available to new groups.
Updating or adding labels in the Admin area does not modify labels in existing projects.
Updating or adding labels in the **Admin** area does not modify labels in existing projects.
![Default label set](img/admin_labels_v17_0.png)

2
doc/administration/lfs/index.md
View File

@ -442,7 +442,7 @@ To switch Git LFS to use pure SSH protocol:
You can see the total storage used for LFS objects for groups and projects in:
- The Admin area
- The **Admin** area
- The [groups](../../api/groups.md) and [projects](../../api/projects.md) APIs
## Related topics

2
doc/administration/maintenance_mode/index.md
View File

@ -122,7 +122,7 @@ For most JSON requests, `POST`, `PUT`, `PATCH`, and `DELETE` are blocked, and th
| `POST` | Paths ending with `/compare`| Git revision routes. |
| `POST` | `.git/git-upload-pack` | To allow Git pull/clone. |
| `POST` | `/api/v4/internal` | [internal API routes](../../development/internal_api/index.md) |
| `POST` | `/admin/sidekiq` | To allow management of background jobs in the Admin area |
| `POST` | `/admin/sidekiq` | To allow management of background jobs in the **Admin** area |
| `POST` | `/admin/geo` | To allow updating Geo Nodes in the administrator UI |
| `POST` | `/api/v4/geo_replication`| To allow certain Geo-specific administrator UI actions on secondary sites |

16
doc/administration/moderate_users.md
View File

@ -55,7 +55,7 @@ To view user sign ups pending approval:
> - Ability to filter a user by state [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/238183) in GitLab 17.0.
A user sign up pending approval can be approved or rejected from the Admin area.
A user sign up pending approval can be approved or rejected from the **Admin** area.
To approve or reject a user sign up:
@ -102,13 +102,13 @@ To block a user:
The user receives an email notification that their account has been blocked. After this email, they no longer receive notifications.
To report abuse from other users, see [report abuse](../user/report_abuse.md). For more information on abuse reports in the Admin area, see [resolving abuse reports](../administration/review_abuse_reports.md#resolving-abuse-reports).
To report abuse from other users, see [report abuse](../user/report_abuse.md). For more information on abuse reports in the **Admin** area, see [resolving abuse reports](../administration/review_abuse_reports.md#resolving-abuse-reports).
### Unblock a user
> - Ability to filter a user by state [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/238183) in GitLab 17.0.
A blocked user can be unblocked from the Admin area. To do this:
A blocked user can be unblocked from the **Admin** area. To do this:
1. On the left sidebar, at the bottom, select **Admin**.
1. Select **Overview > Users**.
@ -226,7 +226,7 @@ A maximum of 240,000 users can be deleted per day.
> - Ability to filter a user by state [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/238183) in GitLab 17.0.
A deactivated user can be activated from the Admin area.
A deactivated user can be activated from the **Admin** area.
To do this:
@ -260,7 +260,7 @@ A banned user:
To block a user and hide their contributions, administrators can ban the user.
Users can be banned using the Admin area. To do this:
Users can be banned using the **Admin** area. To do this:
1. On the left sidebar, at the bottom, select **Admin**.
1. Select **Overview > Users**.
@ -270,7 +270,7 @@ Users can be banned using the Admin area. To do this:
> - Ability to filter a user by state [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/238183) in GitLab 17.0.
A banned user can be unbanned using the Admin area. To do this:
A banned user can be unbanned using the **Admin** area. To do this:
1. On the left sidebar, at the bottom, select **Admin**.
1. Select **Overview > Users**.
@ -282,7 +282,7 @@ The user's state is set to active and they consume a
## Delete a user
Use the Admin area to delete users.
Use the **Admin** area to delete users.
1. On the left sidebar, at the bottom, select **Admin**.
1. Select **Overview > Users**.
@ -309,7 +309,7 @@ Before 15.1, additionally groups of which deleted user were the only owner among
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132402) in GitLab 16.5.
> - Ability to filter a user by state [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/238183) in GitLab 17.0.
You can trust and untrust users from the Admin area.
You can trust and untrust users from the **Admin** area.
By default, a user is not trusted and is blocked from creating issues, notes, and snippets considered to be spam. When you trust a user, they can create issues, notes, and snippets without being blocked.

4
doc/administration/monitoring/performance/grafana_configuration.md
View File

@ -29,12 +29,12 @@ GitLab sidebar:
1. Configure the **Grafana URL**. Enter the full URL of the Grafana instance.
1. Select **Save changes**.
GitLab displays your link in the Admin area under **Monitoring > Metrics Dashboard**.
GitLab displays your link in the **Admin** area under **Monitoring > Metrics Dashboard**.
## Required Scopes
When setting up Grafana through the process above, no scope shows in the screen in
the Admin area under **Applications > GitLab Grafana**. However, the `read_user` scope is
the **Admin** area under **Applications > GitLab Grafana**. However, the `read_user` scope is
required and is provided to the application automatically. Setting any scope other than
`read_user` without also including `read_user` leads to this error when you try to sign in using
GitLab as the OAuth provider:

2
doc/administration/pages/index.md
View File

@ -660,7 +660,7 @@ To do that:
1. Select **Save changes**.
NOTE:
You must enable [Access Control](#access-control) first for the setting to show in the Admin area.
You must enable [Access Control](#access-control) first for the setting to show in the **Admin** area.
### Running behind a proxy

2
doc/administration/reporting/spamcheck.md
View File

@ -67,4 +67,4 @@ Spamcheck service on its own cannot communicate directly over TLS with GitLab.
However, Spamcheck can be deployed behind a reverse proxy which performs TLS
termination. In such a scenario, GitLab can be made to communicate with
Spamcheck over TLS by specifying `tls://` scheme for the external Spamcheck URL
instead of `grpc://` in the Admin area settings.
instead of `grpc://` in the **Admin** area settings.

2
doc/administration/repository_checks.md
View File

@ -34,7 +34,7 @@ To check a project's repository using GitLab UI:
1. In the **Repository check** section, select **Trigger repository check**.
The checks run asynchronously so it may take a few minutes before the check result is visible on the
project page in the Admin area. If the checks fail, see [what to do](#what-to-do-if-a-check-failed).
project page in the **Admin** area. If the checks fail, see [what to do](#what-to-do-if-a-check-failed).
## Enable repository checks for all projects

4
doc/administration/repository_storage_paths.md
View File

@ -65,10 +65,10 @@ translate between the human-readable project name and the hashed storage path. Y
Administrators can look up a project's hashed path from its name or ID using:
- The [Admin area](../administration/admin_area.md#administering-projects).
- The [**Admin** area](../administration/admin_area.md#administering-projects).
- A Rails console.
To look up a project's hash path in the Admin area:
To look up a project's hash path in the **Admin** area:
1. On the left sidebar, at the bottom, select **Admin**.
1. Select **Overview > Projects** and select the project.

2
doc/administration/review_abuse_reports.md
View File

@ -13,7 +13,7 @@ DETAILS:
View and resolve abuse reports from GitLab users.
GitLab administrators can view and [resolve](#resolving-abuse-reports) abuse
reports in the Admin area.
reports in the **Admin** area.
## Receive notification of abuse reports by email

2
doc/administration/review_spam_logs.md
View File

@ -12,7 +12,7 @@ DETAILS:
GitLab tracks user activity and flags certain behavior for potential spam.
In the Admin area, a GitLab administrator can view and resolve spam logs.
In the **Admin** area, a GitLab administrator can view and resolve spam logs.
## Manage spam logs

2
doc/administration/settings/account_and_limit_settings.md
View File

@ -294,7 +294,7 @@ To do this:
NOTE:
When this ability is disabled, GitLab administrators can still use the
[Admin area](../../administration/admin_area.md#administering-users) or the
[**Admin** area](../../administration/admin_area.md#administering-users) or the
[API](../../api/users.md#user-modification) to update usernames.
## Prevent users from creating organizations

8
doc/administration/settings/continuous_integration.md
View File

@ -10,7 +10,7 @@ DETAILS:
**Tier:** Free, Premium, Ultimate
**Offering:** Self-managed
The [Admin area](index.md) has the instance settings for Auto DevOps, runners, and
The [**Admin** area](index.md) has the instance settings for Auto DevOps, runners, and
job artifacts.
## Auto DevOps
@ -132,7 +132,7 @@ The value is in MB, and the default value is 100 MB per job. An administrator ca
## Default artifacts expiration
The default expiration time of the [job artifacts](../../administration/job_artifacts.md)
can be set in the Admin area of your GitLab instance. The syntax of duration is
can be set in the **Admin** area of your GitLab instance. The syntax of duration is
described in [`artifacts:expire_in`](../../ci/yaml/index.md#artifactsexpire_in)
and the default value is `30 days`.
@ -232,7 +232,7 @@ The default value is `0` (no restriction).
## Default CI/CD configuration file
The default CI/CD configuration file and path for new projects can be set in the Admin area
The default CI/CD configuration file and path for new projects can be set in the **Admin** area
of your GitLab instance (`.gitlab-ci.yml` if not set):
1. On the left sidebar, at the bottom, select **Admin**.
@ -247,7 +247,7 @@ It is also possible to specify a [custom CI/CD configuration file for a specific
> - **Maximum number of active pipelines per project** setting [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/368195) in GitLab 16.0.
You can configure some [CI/CD limits](../../administration/instance_limits.md#cicd-limits)
from the Admin area:
from the **Admin** area:
1. On the left sidebar, at the bottom, select **Admin**.
1. Select **Settings > CI/CD**.

2
doc/administration/settings/push_event_activities_limit.md
View File

@ -27,7 +27,7 @@ the activity feed.
To modify this setting:
- In the Admin area:
- In the **Admin** area:
1. On the left sidebar, at the bottom, select **Admin**.
1. Select **Settings > Network**.
1. Expand **Performance optimization**.

2
doc/administration/settings/scim_setup.md
View File

@ -62,7 +62,7 @@ Prerequisites:
To configure Okta for SCIM:
1. Sign in to Okta.
1. In the upper-right corner, select **Admin**. The button is not visible from the Admin area.
1. In the upper-right corner, select **Admin**. The button is not visible from the **Admin** area.
1. In the **Application** tab, select **Browse App Catalog**.
1. Find and select the **GitLab** application.
1. On the GitLab application overview page, select **Add Integration**.

2
doc/administration/settings/security_and_compliance.md
View File

@ -10,7 +10,7 @@ DETAILS:
**Tier:** Ultimate
**Offering:** Self-managed
The settings for package metadata synchronization are located in the [Admin area](index.md).
The settings for package metadata synchronization are located in the [**Admin** area](index.md).
## Choose package registry metadata to sync

6
doc/administration/settings/usage_statistics.md
View File

@ -95,7 +95,7 @@ In the following table, you can see:
If enabled, version check informs you if a new version is available and the
importance of it through a status. The status displays on the help pages (`/help`)
for all authenticated users, and on the Admin area pages. The statuses are:
for all authenticated users, and on the **Admin** area pages. The statuses are:
- Green: You are running the latest version of GitLab.
- Orange: An updated version of GitLab is available.
@ -155,7 +155,7 @@ To enable or disable Service Ping:
### Through the configuration file
To disable Service Ping and prevent it from being configured in the future through
the Admin area.
the **Admin** area.
::Tabs
@ -248,7 +248,7 @@ To enable or disable optional data in Service Ping:
## Access the Service Ping payload
You can access the exact JSON payload sent to GitLab Inc. in the Admin area or through the API.
You can access the exact JSON payload sent to GitLab Inc. in the **Admin** area or through the API.
See an [example Service Ping payload](../../development/internal_analytics/service_ping/index.md#example-service-ping-payload).
### In the UI

4
doc/administration/settings/user_and_ip_rate_limits.md
View File

@ -120,7 +120,7 @@ attached into the response headers.
| Header | Example | Description |
|:----------------------|:--------------------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `RateLimit-Limit` | `60` | The request quota for the client **each minute**. If the rate limit period set in the Admin area is different from 1 minute, the value of this header is adjusted to approximately the nearest 60-minute period. |
| `RateLimit-Limit` | `60` | The request quota for the client **each minute**. If the rate limit period set in the **Admin** area is different from 1 minute, the value of this header is adjusted to approximately the nearest 60-minute period. |
| `RateLimit-Name` | `throttle_authenticated_web` | Name of the throttle blocking the requests. |
| `RateLimit-Observed` | `67` | Number of requests associated to the client in the time window. |
| `RateLimit-Remaining` | `0` | Remaining quota in the time window. The result of `RateLimit-Limit` - `RateLimit-Observed`. |
@ -223,7 +223,7 @@ request continue. The log message contains an `env` field set to `track`. The `m
field contains the name of throttle that was hit.
It is important to set the environment variable **before** enabling
the rate limiting in the settings. The settings in the Admin area
the rate limiting in the settings. The settings in the **Admin** area
take effect immediately, while setting the environment variable
requires a restart of all the Puma processes.

2
doc/administration/sidekiq/sidekiq_troubleshooting.md
View File

@ -570,7 +570,7 @@ For more information about Sidekiq jobs, see the [Sidekiq-cron](https://github.c
## Disabling cron jobs
You can disable any Sidekiq cron jobs by visiting the [Monitoring section in the Admin area](../admin_area.md#monitoring-section). You can also perform the same action using the command line and [Rails Runner](../operations/rails_console.md#using-the-rails-runner).
You can disable any Sidekiq cron jobs by visiting the [Monitoring section in the **Admin** area](../admin_area.md#monitoring-section). You can also perform the same action using the command line and [Rails Runner](../operations/rails_console.md#using-the-rails-runner).
To disable all cron jobs:

2
doc/administration/snippets/index.md
View File

@ -24,7 +24,7 @@ or the [Application settings API](../../api/settings.md).
The limit **must** be in bytes.
This setting is not available in the [Admin area settings](../settings/index.md).
This setting is not available in the [**Admin** area settings](../settings/index.md).
### Use the Rails console

2
doc/administration/static_objects_external_storage.md
View File

@ -82,7 +82,7 @@ other CDNs or Function as a Service (FaaS) systems should work using the same pr
- `ORIGIN_HOSTNAME`: the hostname of your GitLab installation.
- `STORAGE_TOKEN`: any arbitrary secure token. You can get a token by running
`pwgen -cn1 64` on a UNIX machine. Save this token for the Admin area, as
`pwgen -cn1 64` on a UNIX machine. Save this token for the **Admin** area, as
described in the [configuring](#configure-external-storage) section.
```javascript

2
doc/administration/user_settings.md
View File

@ -48,7 +48,7 @@ For self-compiled installations:
Administrators can:
- Use the Admin area to [prevent an existing user from creating top-level groups](../administration/admin_area.md#prevent-a-user-from-creating-top-level-groups).
- Use the **Admin** area to [prevent an existing user from creating top-level groups](../administration/admin_area.md#prevent-a-user-from-creating-top-level-groups).
- Use the [modify an existing user API endpoint](../api/users.md#user-modification) to change the `can_create_group` setting.
## Prevent users from changing their usernames

2
doc/administration/wikis/index.md
View File

@ -27,7 +27,7 @@ is edited again and the content changes.
### Wiki page content size limit configuration
This setting is not available through the [Admin area settings](../settings/index.md).
This setting is not available through the [**Admin** area settings](../settings/index.md).
To configure this setting, use either the Rails console
or the [Application settings API](../../api/settings.md).

2
doc/api/group_import_export.md
View File

@ -97,7 +97,7 @@ returns either:
The maximum import file size can be set by the Administrator on self-managed instances (default is `0` (unlimited)).
As an administrator, you can modify the maximum import file size either:
- In the [Admin area](../administration/settings/import_and_export_settings.md).
- In the [**Admin** area](../administration/settings/import_and_export_settings.md).
- By using the `max_import_size` option in the [Application settings API](settings.md#change-application-settings).
For information on the maximum import file size on GitLab.com, see

2
doc/api/project_import_export.md
View File

@ -213,7 +213,7 @@ requests.post(url, headers=headers, data=data, files=files)
NOTE:
The maximum import file size can be set by the Administrator. It defaults to `0` (unlimited).
As an administrator, you can modify the maximum import file size. To do so, use the `max_import_size` option in the [Application settings API](settings.md#change-application-settings) or the [Admin area](../administration/settings/account_and_limit_settings.md).
As an administrator, you can modify the maximum import file size. To do so, use the `max_import_size` option in the [Application settings API](settings.md#change-application-settings) or the [**Admin** area](../administration/settings/account_and_limit_settings.md).
## Import a file from a remote object storage

2
doc/api/projects.md
View File

@ -2571,7 +2571,7 @@ This endpoint:
[default deletion delay](../administration/settings/visibility_and_access_controls.md#deletion-protection).
WARNING:
The option to delete projects immediately from deletion protection settings in the Admin area was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/389557) in GitLab 15.9 and removed in GitLab 16.0.
The option to delete projects immediately from deletion protection settings in the **Admin** area was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/389557) in GitLab 15.9 and removed in GitLab 16.0.
```plaintext
DELETE /projects/:id

2
doc/api/runners.md
View File

@ -841,7 +841,7 @@ POST /runners
|--------------------|--------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `token` | string | yes | [Registration token](#registration-and-authentication-tokens) |
| `description` | string | no | Description of the runner |
| `info` | hash | no | Runner's metadata. You can include `name`, `version`, `revision`, `platform`, and `architecture`, but only `version`, `platform`, and `architecture` are displayed in the Admin area of the UI |
| `info` | hash | no | Runner's metadata. You can include `name`, `version`, `revision`, `platform`, and `architecture`, but only `version`, `platform`, and `architecture` are displayed in the **Admin** area of the UI |
| `active` | boolean | no | Deprecated: Use `paused` instead. Specifies if the runner is allowed to receive new jobs |
| `paused` | boolean | no | Specifies if the runner should ignore new jobs |
| `locked` | boolean | no | Specifies if the runner should be locked for the current project |

6
doc/api/settings.md
View File

@ -368,8 +368,8 @@ listed in the descriptions of the relevant settings.
| Attribute | Type | Required | Description |
|------------------------------------------|------------------|:------------------------------------:|-------------|
| `admin_mode` | boolean | no | Require administrators to enable Admin Mode by re-authenticating for administrative tasks. |
| `admin_notification_email` | string | no | Deprecated: Use `abuse_notification_email` instead. If set, [abuse reports](../administration/review_abuse_reports.md) are sent to this address. Abuse reports are always available in the Admin area. |
| `abuse_notification_email` | string | no | If set, [abuse reports](../administration/review_abuse_reports.md) are sent to this address. Abuse reports are always available in the Admin area. |
| `admin_notification_email` | string | no | Deprecated: Use `abuse_notification_email` instead. If set, [abuse reports](../administration/review_abuse_reports.md) are sent to this address. Abuse reports are always available in the **Admin** area. |
| `abuse_notification_email` | string | no | If set, [abuse reports](../administration/review_abuse_reports.md) are sent to this address. Abuse reports are always available in the **Admin** area. |
| `notify_on_unknown_sign_in` | boolean | no | Enable sending notification if sign in from unknown IP address happens. |
| `after_sign_out_path` | string | no | Where to redirect users after logout. |
| `email_restrictions_enabled` | boolean | no | Enable restriction for sign-up by email. |
@ -394,7 +394,7 @@ listed in the descriptions of the relevant settings.
| `auto_devops_domain` | string | no | Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages. |
| `auto_devops_enabled` | boolean | no | Enable Auto DevOps for projects by default. It automatically builds, tests, and deploys applications based on a predefined CI/CD configuration. |
| `automatic_purchased_storage_allocation` | boolean | no | Enabling this permits automatic allocation of purchased storage in a namespace. Relevant only to EE distributions. |
| `bulk_import_enabled` | boolean | no | Enable migrating GitLab groups by direct transfer. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/383268) in GitLab 15.8. Setting also [available](../administration/settings/import_and_export_settings.md#enable-migration-of-groups-and-projects-by-direct-transfer) in the Admin area. |
| `bulk_import_enabled` | boolean | no | Enable migrating GitLab groups by direct transfer. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/383268) in GitLab 15.8. Setting also [available](../administration/settings/import_and_export_settings.md#enable-migration-of-groups-and-projects-by-direct-transfer) in the **Admin** area. |
| `bulk_import_max_download_file_size` | integer | no | Maximum download file size when importing from source GitLab instances by direct transfer. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/384976) in GitLab 16.3. |
| `can_create_group` | boolean | no | Indicates whether users can create top-level groups. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/367754) in GitLab 15.5. Defaults to `true`. |
| `check_namespace_plan` | boolean | no | Enabling this makes only licensed EE features available to projects if the project namespace's plan includes the feature or if the project is public. Premium and Ultimate only. |

2
doc/api/templates/dockerfiles.md
View File

@ -23,7 +23,7 @@ DETAILS:
In [GitLab Premium and Ultimate](https://about.gitlab.com/pricing/) tiers, GitLab instance
administrators can override templates in the
[Admin area](../../administration/settings/instance_template_repository.md).
[**Admin** area](../../administration/settings/instance_template_repository.md).
## List Dockerfile templates

2
doc/ci/components/index.md
View File

@ -555,7 +555,7 @@ To access the CI/CD Catalog and view the published components that are available
1. Select **CI/CD Catalog**.
Alternatively, if you are already in the [pipeline editor](../pipeline_editor/index.md)
in your project, you can select **Browse CI/CD Catalog**.
in your project, you can select **CI/CD Catalog**.
Visibility of components in the CI/CD catalog follows the component source project's
[visibility setting](../../user/public_access.md). Components with source projects set to:

4
doc/ci/pipelines/compute_minutes.md
View File

@ -406,12 +406,12 @@ An administrator can reset the compute usage for a namespace for the current mon
### Reset usage for a personal namespace
1. Find the [user in the Admin area](../../administration/admin_area.md#administering-users).
1. Find the [user in the **Admin** area](../../administration/admin_area.md#administering-users).
1. Select **Edit**.
1. In **Limits**, select **Reset compute usage**.
### Reset usage for a group namespace
1. Find the [group in the Admin area](../../administration/admin_area.md#administering-groups).
1. Find the [group in the **Admin** area](../../administration/admin_area.md#administering-groups).
1. Select **Edit**.
1. In **Permissions and group features**, select **Reset compute usage**.

2
doc/ci/runners/new_creation_workflow.md
View File

@ -78,7 +78,7 @@ To continue using registration tokens after GitLab 17.0:
- On GitLab.com, you can manually [enable the legacy runner registration process](runners_scope.md#enable-use-of-runner-registration-tokens-in-projects-and-groups)
in the top-level group settings until GitLab 18.0.
- On GitLab self-managed, you can manually [enable the legacy runner registration process](../../administration/settings/continuous_integration.md#enable-runner-registrations-tokens)
in the Admin area settings until GitLab 18.0.
in the **Admin** area settings until GitLab 18.0.
## Impact on existing runners

2
doc/ci/runners/runner_fleet_dashboard_groups.md
View File

@ -24,7 +24,7 @@ The following metrics are available in the runner fleet dashboard:
| Metric | Description |
|-------------------------------|-------------|
| Online | Number of online runners. In the Admin area, this metric displays the number of runners for the entire instance. In a group, this metric displays the number of runners for the group and its subgroups. |
| Online | Number of online runners. In the **Admin** area, this metric displays the number of runners for the entire instance. In a group, this metric displays the number of runners for the group and its subgroups. |
| Offline | Number of offline runners. |
| Active runners | Number of active runners. |
| Runner usage (previous month) | Number of compute minutes used by each project on group runners. Includes the option to export as CSV for cost analysis. |

4
doc/ci/runners/runners_scope.md
View File

@ -81,7 +81,7 @@ should be used instead. For more information, see [Migrating to the new runner r
Prerequisites:
- Runner registration tokens must be [enabled](../../administration/settings/continuous_integration.md#enable-runner-registrations-tokens) in the Admin area.
- Runner registration tokens must be [enabled](../../administration/settings/continuous_integration.md#enable-runner-registrations-tokens) in the **Admin** area.
- You must be an administrator.
To create an instance runner:
@ -689,7 +689,7 @@ you can enable runner registration tokens for projects and groups. This setting
Prerequisites:
- Runner registration tokens must be [enabled](../../administration/settings/continuous_integration.md#enable-runner-registrations-tokens) in the Admin area.
- Runner registration tokens must be [enabled](../../administration/settings/continuous_integration.md#enable-runner-registrations-tokens) in the **Admin** area.
1. On the left sidebar, select **Search or go to** and find your group.
1. Select **Settings > CI/CD**.

2
doc/ci/variables/index.md
View File

@ -292,7 +292,7 @@ Prerequisites:
To mask a variable:
1. For the group, project, or in the Admin area, select **Settings > CI/CD**.
1. For the group, project, or in the **Admin** area, select **Settings > CI/CD**.
1. Expand **Variables**.
1. Next to the variable you want to protect, select **Edit**.
1. Select the **Mask variable** checkbox.

2
doc/development/application_limits.md
View File

@ -170,7 +170,7 @@ The process for adding a new throttle is loosely:
1. Update the JSON schema validator for the [rate_limits column](https://gitlab.com/gitlab-org/gitlab/-/blob/63b37287ae028842fcdcf56d311e6bb0c7e09e79/app/validators/json_schemas/application_setting_rate_limits.json).
1. Extend `Gitlab::RackAttack` and `Gitlab::RackAttack::Request` to configure the new rate limit,
and apply it to the desired requests.
1. Add the new settings to the Admin area form in `app/views/admin/application_settings/_ip_limits.html.haml`.
1. Add the new settings to the **Admin** area form in `app/views/admin/application_settings/_ip_limits.html.haml`.
1. Document the new settings in [User and IP rate limits](../administration/settings/user_and_ip_rate_limits.md) and [Application settings API](../api/settings.md).
1. Configure the rate limit for GitLab.com and document it in [GitLab.com-specific rate limits](../user/gitlab_com/index.md#gitlabcom-specific-rate-limits).

2
doc/development/documentation/styleguide/availability_details.md
View File

@ -154,7 +154,7 @@ Instance administrator documentation often includes sections that mention:
- Changing the `gitlab.rb` or `gitlab.yml` files.
- Accessing the rails console or running Rake tasks.
- Doing things in the Admin area.
- Doing things in the **Admin** area.
These pages should also mention if the tasks can only be accomplished by an
instance administrator.

2
doc/development/documentation/styleguide/index.md
View File

@ -1038,7 +1038,7 @@ To create a group:
1. On the left sidebar, at the top, select **Create new** (**{plus}**) and **New group**.
```
To open the Admin area:
To open the **Admin** area:
```markdown
1. On the left sidebar, at the bottom, select **Admin**.

2
doc/development/documentation/styleguide/word_list.md
View File

@ -216,7 +216,7 @@ Do not use **and so on**. Instead, be more specific. For more information, see t
## area
Use [**section**](#section) instead of **area**. The only exception is [the Admin area](#admin-area).
Use [**section**](#section) instead of **area**. The only exception is [the **Admin** area](#admin-area).
## as

4
doc/development/geo.md
View File

@ -110,7 +110,7 @@ projects that need updating. Those projects can be:
timestamp that is more recent than the `last_repository_successful_sync_at`
timestamp in the `Geo::ProjectRegistry` model.
- Manual: The administrator can manually flag a repository to resync in the
[Geo Admin area](../administration/geo_sites.md).
[Geo **Admin** area](../administration/geo_sites.md).
When we fail to fetch a repository on the secondary `RETRIES_BEFORE_REDOWNLOAD`
times, Geo does a so-called _re-download_. It will do a clean clone
@ -465,7 +465,7 @@ basically hashes all Git refs together and stores that hash in the
The **secondary** site does the same to calculate the hash of its
clone, and compares the hash with the value the **primary** site
calculated. If there is a mismatch, Geo will mark this as a mismatch
and the administrator can see this in the [Geo Admin area](../administration/geo_sites.md).
and the administrator can see this in the [Geo **Admin** area](../administration/geo_sites.md).
## Geo proxying

2
doc/development/internal_analytics/metrics/metrics_dictionary.md
View File

@ -102,7 +102,7 @@ A metric's time frame is calculated based on the `time_frame` field and the `dat
We use the following categories to classify a metric:
- `operational`: Required data for operational purposes.
- `optional`: Default value for a metric. Data that is optional to collect. This can be [enabled or disabled](../../../administration/settings/usage_statistics.md#enable-or-disable-service-ping) in the Admin area.
- `optional`: Default value for a metric. Data that is optional to collect. This can be [enabled or disabled](../../../administration/settings/usage_statistics.md#enable-or-disable-service-ping) in the **Admin** area.
- `subscription`: Data related to licensing.
- `standard`: Standard set of identifiers that are included when collecting data.

2
doc/development/internal_analytics/service_ping/troubleshooting.md
View File

@ -104,7 +104,7 @@ Gitlab::Usage::ServicePingReport.for(output: :all_metrics_values, cached: true)
Use the following method in the [rails console](../../../administration/operations/rails_console.md#starting-a-rails-console-session).
This also refreshes the cached Service Ping displayed in the Admin area.
This also refreshes the cached Service Ping displayed in the **Admin** area.
```ruby
Gitlab::Usage::ServicePingReport.for(output: :all_metrics_values)

6
doc/development/internal_api/index.md
View File

@ -1112,7 +1112,7 @@ Example response:
## Storage limit exclusions
The namespace storage limit exclusion endpoints manage storage limit exclusions on top-level namespaces on GitLab.com.
These endpoints can only be consumed in the Admin area of GitLab.com.
These endpoints can only be consumed in the **Admin** area of GitLab.com.
### Retrieve storage limit exclusions
@ -1208,7 +1208,7 @@ Example response:
### Known consumers
- GitLab.com Admin area
- GitLab.com **Admin** area
## Compute quota provisioning
@ -1603,7 +1603,7 @@ Example response:
Returns a `201` status code if successful.
NOTE:
After you create a group SCIM identity for a user, you can see that SCIM identity in the Admin area.
After you create a group SCIM identity for a user, you can see that SCIM identity in the **Admin** area.
### Update a single SCIM provisioned user

2
doc/development/permissions/predefined_roles.md
View File

@ -17,7 +17,7 @@ Each user can be one of the following types:
- [Internal users](../internal_users.md) - system created.
- [Auditor](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/app/policies/ee/base_policy.rb#L9):
- No access to projects or groups settings menu.
- No access to Admin area.
- No access to **Admin** area.
- Read-only access to everything else.
- [Administrator](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/policies/base_policy.rb#L6) - read-write access.

2
doc/development/spam_protection_and_captcha/exploratory_testing.md
View File

@ -273,7 +273,7 @@ GraphQL response:
### Scenario: Akismet enabled, CAPTCHA disabled
For this scenario, ensure you clear **Enable reCAPTCHA** in the Admin area settings as described above.
For this scenario, ensure you clear **Enable reCAPTCHA** in the **Admin** area settings as described above.
If CAPTCHA is not enabled, any request flagged as potential spam fails with no chance to resubmit,
even if it could otherwise be resubmitted if CAPTCHA were enabled and successfully solved.

2
doc/development/spam_protection_and_captcha/model_and_services.md
View File

@ -57,7 +57,7 @@ To do this:
The `SpammableActions::AkismetMarkAsSpamAction` module adds support for a `#mark_as_spam` action
to a controller. This controller allows administrators to manage spam for the associated
`Spammable` model in the [**Spam log** section](../../integration/akismet.md) of the Admin area page.
`Spammable` model in the [**Spam log** section](../../integration/akismet.md) of the **Admin** area.
1. Include the `SpammableActions::AkismetMarkAsSpamAction` module in the controller.

2
doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
View File

@ -25,7 +25,7 @@ This is a partial list of the [RSpec metadata](https://rspec.info/features/3-12/
| `:instance_saml` | The test requires a GitLab instance that has SAML SSO enabled for the instance. Interacts with an external SAML identity provider. Paired with the `:orchestrated` tag. |
| `:integrations` | This aims to test the available [integrations](../../../user/project/integrations/index.md#available-integrations). The test requires Docker to be installed in the run context. It will provision the containers and can be run against a local instance or using the `gitlab-qa` scenario `Test::Integration::Integrations`. |
| `:issue`, `:issue_${num}` | Optional links to issues which might be related to the spec. Helps keep track of related issues and can also be used by tools that create test reports. Currently added automatically to `Allure` test report. Multiple tags can be used by adding an optional numeric suffix like `issue_1`, `issue_2` etc. |
| `:service_ping_disabled` | The test interacts with the GitLab configuration service ping at the instance level to turn Admin area setting service ping checkbox on or off. This tag will have the test run only in the `service_ping_disabled` job and must be paired with the `:orchestrated` and `:requires_admin` tags. |
| `:service_ping_disabled` | The test interacts with the GitLab configuration service ping at the instance level to turn **Admin** area setting service ping checkbox on or off. This tag will have the test run only in the `service_ping_disabled` job and must be paired with the `:orchestrated` and `:requires_admin` tags. |
| `:jira` | The test requires a Jira Server. [GitLab-QA](https://gitlab.com/gitlab-org/gitlab-qa) provisions the Jira Server in a Docker container when the `Test::Integration::Jira` test scenario is run. |
| `:kubernetes` | The test includes a GitLab instance that is configured to be run behind an SSH tunnel, allowing a TLS-accessible GitLab. This test also includes provisioning of at least one Kubernetes cluster to test against. _This tag is often be paired with `:orchestrated`._ |
| `:ldap_no_server` | The test requires a GitLab instance to be configured to use LDAP. To be used with the `:orchestrated` tag. It does not spin up an LDAP server at orchestration time. Instead, it creates the LDAP server at runtime. |

2
doc/install/azure/index.md
View File

@ -291,7 +291,7 @@ To update GitLab to the latest version:
before anything else.
```
Refresh your GitLab instance in the browser and go to the Admin area. You should now have an
Refresh your GitLab instance in the browser and go to the **Admin** area. You should now have an
up-to-date GitLab instance.
## Next steps and further configuration

2
doc/install/docker_troubleshooting.md
View File

@ -125,7 +125,7 @@ writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with un
writing value to /dev/shm/gitlab/sidekiq/histogram_sidekiq_0-0.db failed with unmapped file
```
Other than disabling the Prometheus Metrics from the Admin area, the recommended
Other than disabling the Prometheus Metrics from the **Admin** area, the recommended
solution to fix this problem is to [install](docker.md#pre-configure-docker-container) with shared memory set to at least 256 MB.
If using `docker run`, this can be done by passing the flag `--shm-size 256m`.
If using a `docker-compose.yml` file, the `shm_size` key can be used for this

Some files were not shown because too many files have changed in this diff Show More