Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
bcc887fb11
commit
4466b06708
|
|
@ -191,7 +191,7 @@ export default {
|
|||
<template #toggle>
|
||||
<gl-button
|
||||
class="gl-max-w-full gl-display-flex gl-align-items-center gl-text-truncate"
|
||||
:class="{ 'gl-inset-border-1-red-400!': !selectedIdValid }"
|
||||
:class="{ '!gl-shadow-inner-1-red-400': !selectedIdValid }"
|
||||
button-text-classes="gl-display-flex"
|
||||
>
|
||||
<template v-if="selectedLabel">
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ export default {
|
|||
</script>
|
||||
<template>
|
||||
<div
|
||||
class="gl-w-13 gl-h-6 gl-font-sm gl-bg-white gl-inset-border-1-blue-500 gl-text-center gl-text-truncate gl-rounded-pill gl-px-4 gl-py-2 gl-relative gl-z-index-1 gl-transition-duration-slow gl-transition-timing-function-ease"
|
||||
class="gl-w-13 gl-h-6 gl-font-sm gl-bg-white gl-shadow-inner-1-blue-500 gl-text-center gl-text-truncate gl-rounded-pill gl-px-4 gl-py-2 gl-relative gl-z-index-1 gl-transition-duration-slow gl-transition-timing-function-ease"
|
||||
>
|
||||
{{ jobName }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ export default {
|
|||
jobPillClasses() {
|
||||
return [
|
||||
{ 'gl-opacity-3': this.isFadedOut },
|
||||
{ 'gl-bg-gray-50 gl-inset-border-1-gray-200': this.isHovered },
|
||||
{ 'gl-bg-gray-50 gl-shadow-inner-1-gray-200': this.isHovered },
|
||||
];
|
||||
},
|
||||
},
|
||||
|
|
@ -61,7 +61,7 @@ export default {
|
|||
<tooltip-on-truncate :title="jobName" truncate-target="child" placement="top">
|
||||
<div
|
||||
:id="id"
|
||||
class="gl-bg-white gl-inset-border-1-gray-100 gl-text-center gl-text-truncate gl-rounded-6 gl-mb-3 gl-px-5 gl-py-3 gl-relative gl-z-index-1 gl-transition-duration-slow gl-transition-timing-function-ease"
|
||||
class="gl-bg-white gl-shadow-inner-1-gray-100 gl-text-center gl-text-truncate gl-rounded-6 gl-mb-3 gl-px-5 gl-py-3 gl-relative gl-z-index-1 gl-transition-duration-slow gl-transition-timing-function-ease"
|
||||
:class="jobPillClasses"
|
||||
@mouseover="onMouseEnter"
|
||||
@mouseleave="onMouseLeave"
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@ export default {
|
|||
switch (this.jobStatus) {
|
||||
case JOB_STATUS_RUNNING:
|
||||
return {
|
||||
classes: 'gl-text-blue-600! gl-inset-border-1-gray-400 gl-border-blue-600!',
|
||||
classes: 'gl-text-blue-600! gl-shadow-inner-1-gray-400 gl-border-blue-600!',
|
||||
label: I18N_JOB_STATUS_RUNNING,
|
||||
};
|
||||
case JOB_STATUS_IDLE:
|
||||
return {
|
||||
classes: 'gl-text-gray-700! gl-inset-border-1-gray-400 gl-border-gray-500!',
|
||||
classes: 'gl-text-gray-700! gl-shadow-inner-1-gray-400 gl-border-gray-500!',
|
||||
label: I18N_JOB_STATUS_IDLE,
|
||||
};
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ export default Mark.create({
|
|||
{
|
||||
title: __('Inline math'),
|
||||
'data-toggle': 'tooltip',
|
||||
class: 'gl-inset-border-1-gray-400',
|
||||
class: 'gl-shadow-inner-1-gray-400',
|
||||
...HTMLAttributes,
|
||||
},
|
||||
0,
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ export default {
|
|||
'gl-font-base',
|
||||
'gl-font-weight-normal',
|
||||
'gl-line-height-normal',
|
||||
'gl-inset-border-1-gray-200',
|
||||
'gl-shadow-inner-1-gray-200',
|
||||
'gl-py-3',
|
||||
'gl-px-4',
|
||||
'gl-mb-0',
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ export default {
|
|||
},
|
||||
methods: {
|
||||
linkClass(index) {
|
||||
return index === this.currentTabIndex ? 'gl-inset-border-b-2-theme-accent' : '';
|
||||
return index === this.currentTabIndex ? 'gl-shadow-inner-b-2-theme-accent' : '';
|
||||
},
|
||||
updateCurrentTab() {
|
||||
const hasKubernetesIntegration = this.environment?.clusterAgent;
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ export default {
|
|||
|
||||
<template>
|
||||
<fieldset
|
||||
class="gl-rounded-base gl-inset-border-1-gray-400 gl-py-4 gl-px-5"
|
||||
class="gl-rounded-base gl-shadow-inner-1-gray-400 gl-py-4 gl-px-5"
|
||||
:class="{
|
||||
'gl-outline-none! gl-focus-ring-border-1-gray-900!': isFocused,
|
||||
}"
|
||||
|
|
|
|||
|
|
@ -82,8 +82,8 @@ export default {
|
|||
ref="newName"
|
||||
class="gl-rounded-top-left-none gl-rounded-bottom-left-none"
|
||||
:class="{
|
||||
'gl-inset-border-1-gray-200!': isPathSelectionAvailable,
|
||||
'gl-inset-border-1-gray-100!': !isPathSelectionAvailable,
|
||||
'!gl-shadow-inner-1-gray-200': isPathSelectionAvailable,
|
||||
'!gl-shadow-inner-1-gray-100': !isPathSelectionAvailable,
|
||||
}"
|
||||
debounce="500"
|
||||
data-testid="target-namespace-input"
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ export default {
|
|||
v-gl-tooltip="__('Comments')"
|
||||
class="gl-align-self-center gl-ml-4"
|
||||
>
|
||||
<gl-icon name="comments" class="gl-vertical-align-middle!" />
|
||||
<gl-icon name="comments" class="!gl-align-middle" />
|
||||
{{ mergeRequest.userDiscussionsCount }}
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ export default {
|
|||
|
||||
<template #row-details="{ item }">
|
||||
<div
|
||||
class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-bg-gray-10 gl-rounded-base gl-inset-border-1-gray-100"
|
||||
class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-bg-gray-10 gl-rounded-base gl-shadow-inner-1-gray-100"
|
||||
>
|
||||
<file-sha
|
||||
v-if="item.file_sha256"
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ export default {
|
|||
<additional-metadata-loader v-if="isLoading" />
|
||||
<div
|
||||
v-if="showMetadata"
|
||||
class="gl-bg-gray-50 gl-inset-border-1-gray-100 gl-rounded-base"
|
||||
class="gl-bg-gray-50 gl-shadow-inner-1-gray-100 gl-rounded-base"
|
||||
data-testid="main"
|
||||
>
|
||||
<component
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ export default {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<div class="gl-bg-gray-50 gl-inset-border-1-gray-100 gl-rounded-base">
|
||||
<div class="gl-bg-gray-50 gl-shadow-inner-1-gray-100 gl-rounded-base">
|
||||
<div
|
||||
v-for="index in $options.loader.repeat"
|
||||
:key="index"
|
||||
|
|
|
|||
|
|
@ -469,7 +469,7 @@ export default {
|
|||
|
||||
<template #row-details="{ item }">
|
||||
<div
|
||||
class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-bg-gray-10 gl-rounded-base gl-inset-border-1-gray-100"
|
||||
class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-bg-gray-10 gl-rounded-base gl-shadow-inner-1-gray-100"
|
||||
>
|
||||
<file-sha
|
||||
v-if="item.fileSha256"
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ export default {
|
|||
<span
|
||||
v-gl-tooltip="{ title: path }"
|
||||
data-testid="ellipsis-icon"
|
||||
class="gl-inset-border-1-gray-200 gl-rounded-base gl-px-2 gl-min-w-0"
|
||||
class="gl-shadow-inner-1-gray-200 gl-rounded-base gl-px-2 gl-min-w-0"
|
||||
>
|
||||
<gl-icon name="ellipsis_h" />
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import { checkRules } from './project_name_rules';
|
|||
let hasUserDefinedProjectPath = false;
|
||||
let hasUserDefinedProjectName = false;
|
||||
const invalidInputClass = 'gl-field-error-outline';
|
||||
const invalidDropdownClass = 'gl-inset-border-1-red-400!';
|
||||
const invalidDropdownClass = '!gl-shadow-inner-1-red-400';
|
||||
|
||||
const cancelSource = axios.CancelToken.source();
|
||||
const endpoint = `${gon.relative_url_root}/import/url/validate`;
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ export default {
|
|||
extendedToggleButtonClass() {
|
||||
const classes = [
|
||||
{
|
||||
'gl-inset-border-1-red-500!': !this.state,
|
||||
'!gl-shadow-inner-1-red-500': !this.state,
|
||||
'gl-font-monospace': Boolean(this.selectedRef),
|
||||
},
|
||||
'gl-mb-0',
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ export default {
|
|||
},
|
||||
previewColorClasses() {
|
||||
const borderStyle =
|
||||
this.state === false ? 'gl-inset-border-1-red-500' : 'gl-inset-border-1-gray-400';
|
||||
this.state === false ? 'gl-shadow-inner-1-red-500' : 'gl-shadow-inner-1-gray-400';
|
||||
|
||||
return `${PREVIEW_COLOR_DEFAULT_CLASSES} ${borderStyle}`;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -237,9 +237,9 @@ export default {
|
|||
@hidden="hideDropdown"
|
||||
>
|
||||
<template #toggle>
|
||||
<div class="gl-min-h-7 gl-mb-2 gl-md-mb-0!">
|
||||
<div class="gl-min-h-7 gl-mb-2 gl-sm-mb-0!">
|
||||
<gl-button
|
||||
class="gl-md-display-none! gl-new-dropdown-toggle gl-w-full"
|
||||
class="gl-sm-display-none! gl-new-dropdown-toggle gl-w-full"
|
||||
button-text-classes="gl-display-flex gl-justify-content-space-between gl-w-full"
|
||||
category="secondary"
|
||||
tabindex="0"
|
||||
|
|
@ -249,7 +249,7 @@ export default {
|
|||
<gl-icon class="dropdown-chevron" name="chevron-down" />
|
||||
</gl-button>
|
||||
<gl-button
|
||||
class="gl-display-none gl-md-display-flex! gl-new-dropdown-toggle gl-new-dropdown-icon-only gl-new-dropdown-toggle-no-caret gl-ml-3"
|
||||
class="gl-display-none gl-sm-display-flex! gl-new-dropdown-toggle gl-new-dropdown-icon-only gl-new-dropdown-toggle-no-caret"
|
||||
category="tertiary"
|
||||
icon="ellipsis_v"
|
||||
tabindex="0"
|
||||
|
|
@ -275,7 +275,7 @@ export default {
|
|||
>
|
||||
<gl-disclosure-dropdown-item
|
||||
v-if="canUpdateMergeRequest"
|
||||
class="gl-md-display-none!"
|
||||
class="gl-sm-display-none!"
|
||||
data-testid="edit-merge-request"
|
||||
:item="editItem"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ export default {
|
|||
<div v-if="isDetailsShown" class="gl-display-flex">
|
||||
<div class="gl-w-7"></div>
|
||||
<div
|
||||
class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-bg-gray-10 gl-rounded-base gl-inset-border-1-gray-100 gl-mb-3"
|
||||
class="gl-display-flex gl-flex-direction-column gl-flex-grow-1 gl-bg-gray-10 gl-rounded-base gl-shadow-inner-1-gray-100 gl-mb-3"
|
||||
>
|
||||
<div
|
||||
v-for="(row, detailIndex) in detailsSlots"
|
||||
|
|
|
|||
|
|
@ -134,8 +134,8 @@ export default {
|
|||
data-testid="registry-sort-dropdown"
|
||||
class="gl-mt-3 gl-md-mt-0 gl-w-full gl-md-w-auto"
|
||||
dropdown-class="gl-w-full"
|
||||
dropdown-toggle-class="gl-inset-border-1-gray-400!"
|
||||
sort-direction-toggle-class="gl-inset-border-1-gray-400!"
|
||||
dropdown-toggle-class="!gl-shadow-inner-1-gray-400"
|
||||
sort-direction-toggle-class="!gl-shadow-inner-1-gray-400"
|
||||
:text="sortText"
|
||||
:is-ascending="isSortAscending"
|
||||
:sort-direction-tool-tip="sortDirectionData.tooltip"
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ export default {
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<gl-badge :size="size" class="gl-bg-transparent! gl-inset-border-1-gray-100!">
|
||||
<gl-badge :size="size" class="gl-bg-transparent! !gl-shadow-inner-1-gray-100">
|
||||
<slot></slot>
|
||||
</gl-badge>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ export default {
|
|||
return WORK_ITEMS_TYPE_MAP[this.childrenType]?.name;
|
||||
},
|
||||
tokenSelectorContainerClass() {
|
||||
return !this.areWorkItemsToAddValid ? 'gl-inset-border-1-red-500!' : '';
|
||||
return !this.areWorkItemsToAddValid ? '!gl-shadow-inner-1-red-500' : '';
|
||||
},
|
||||
queryVariables() {
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@
|
|||
width: 160px;
|
||||
|
||||
&:hover {
|
||||
@include gl-inset-border-1-gray-400;
|
||||
@apply gl-shadow-inner-1-gray-400;
|
||||
}
|
||||
|
||||
&:hover,
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@
|
|||
margin-bottom: $gl-spacing-scale-3;
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
@include gl-inset-border-l-4-gray-100;
|
||||
@apply gl-shadow-inner-l-4-gray-100;
|
||||
|
||||
&:dir(rtl) {
|
||||
border-left: 0;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
margin-top: $gl-spacing-scale-3;
|
||||
margin-bottom: $gl-spacing-scale-3;
|
||||
margin-right: 0;
|
||||
@include gl-inset-border-l-4-gray-100;
|
||||
@apply gl-shadow-inner-l-4-gray-100;
|
||||
margin-left: 4px;
|
||||
border: 0 !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,15 +208,23 @@ class Packages::Package < ApplicationRecord
|
|||
scope :order_by_package_file, -> { joins(:package_files).order('packages_package_files.created_at ASC') }
|
||||
|
||||
scope :order_project_path, -> do
|
||||
keyset_order = keyset_pagination_order(join_class: Project, column_name: :path, direction: :asc)
|
||||
|
||||
joins(:project).reorder(keyset_order)
|
||||
build_keyset_order_on_joined_column(
|
||||
scope: joins(:project),
|
||||
attribute_name: 'project_path',
|
||||
column: Project.arel_table[:path],
|
||||
direction: :asc,
|
||||
nullable: :nulls_last
|
||||
)
|
||||
end
|
||||
|
||||
scope :order_project_path_desc, -> do
|
||||
keyset_order = keyset_pagination_order(join_class: Project, column_name: :path, direction: :desc)
|
||||
|
||||
joins(:project).reorder(keyset_order)
|
||||
build_keyset_order_on_joined_column(
|
||||
scope: joins(:project),
|
||||
attribute_name: 'project_path',
|
||||
column: Project.arel_table[:path],
|
||||
direction: :desc,
|
||||
nullable: :nulls_first
|
||||
)
|
||||
end
|
||||
|
||||
def self.inheritance_column = 'package_type'
|
||||
|
|
@ -294,33 +302,6 @@ class Packages::Package < ApplicationRecord
|
|||
end
|
||||
end
|
||||
|
||||
def self.keyset_pagination_order(join_class:, column_name:, direction: :asc)
|
||||
join_table = join_class.table_name
|
||||
asc_order_expression = join_class.arel_table[column_name].asc.nulls_last
|
||||
desc_order_expression = join_class.arel_table[column_name].desc.nulls_first
|
||||
order_direction = direction == :asc ? asc_order_expression : desc_order_expression
|
||||
reverse_order_direction = direction == :asc ? desc_order_expression : asc_order_expression
|
||||
arel_order_classes = ::Gitlab::Pagination::Keyset::ColumnOrderDefinition::AREL_ORDER_CLASSES.invert
|
||||
|
||||
::Gitlab::Pagination::Keyset::Order.build(
|
||||
[
|
||||
::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
|
||||
attribute_name: "#{join_table}_#{column_name}",
|
||||
column_expression: join_class.arel_table[column_name],
|
||||
order_expression: order_direction,
|
||||
reversed_order_expression: reverse_order_direction,
|
||||
order_direction: direction,
|
||||
distinct: false,
|
||||
add_to_projections: true
|
||||
),
|
||||
::Gitlab::Pagination::Keyset::ColumnOrderDefinition.new(
|
||||
attribute_name: 'id',
|
||||
order_expression: arel_order_classes[direction].new(Packages::Package.arel_table[:id]),
|
||||
add_to_projections: true
|
||||
)
|
||||
])
|
||||
end
|
||||
|
||||
def versions
|
||||
project.packages
|
||||
.preload_pipelines
|
||||
|
|
|
|||
|
|
@ -47,7 +47,13 @@ module Ci
|
|||
|
||||
every_x_minutes = (1.day.in_minutes / daily_limit).to_i
|
||||
|
||||
Gitlab::Ci::CronParser.parse_natural("every #{every_x_minutes} minutes", Time.zone.name)
|
||||
begin
|
||||
Gitlab::Ci::CronParser.parse_natural("every #{every_x_minutes} minutes", Time.zone.name)
|
||||
rescue ZeroDivisionError
|
||||
# Fugit returns ZeroDivision Error if provided a number
|
||||
# less than 1 in the expression.
|
||||
nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
.gl-md-ml-3.dropdown.gl-dropdown{ class: "gl-display-none! gl-md-display-flex!" }
|
||||
.gl-sm-ml-3.dropdown.gl-dropdown
|
||||
#js-check-out-modal{ data: how_merge_modal_data(@merge_request) }
|
||||
= render Pajamas::ButtonComponent.new(category: :primary, variant: :confirm, button_options: { data: { toggle: 'dropdown', testid: 'mr-code-dropdown' } }) do
|
||||
= render Pajamas::ButtonComponent.new(category: :primary, variant: :confirm, button_text_classes: 'gl-display-inline-flex gl-justify-content-space-between gl-w-full', button_options: { class: 'gl-display-flex gl-align-self-start gl-w-full gl-s-w-auto', data: { toggle: 'dropdown', testid: 'mr-code-dropdown' } }) do
|
||||
= _('Code')
|
||||
= sprite_icon "chevron-down", size: 16, css_class: "gl-icon gl-mr-0!"
|
||||
.dropdown-menu.dropdown-menu-right
|
||||
|
|
|
|||
|
|
@ -12,25 +12,26 @@
|
|||
- c.with_body do
|
||||
= _('The source project of this merge request has been removed.')
|
||||
|
||||
.detail-page-header.border-bottom-0.gl-display-block.gl-pt-5{ class: "gl-md-display-flex! #{'is-merge-request' if !fluid_layout}" }
|
||||
.detail-page-header.border-bottom-0.gl-display-block.gl-pt-5{ class: "gl-sm-display-flex! #{'is-merge-request' if !fluid_layout}" }
|
||||
.detail-page-header-body
|
||||
%h1.title.page-title.gl-font-size-h-display.gl-my-0.gl-display-inline-block.gl-flex-grow-1.gl-word-break-word{ data: { testid: 'title-content' } }
|
||||
= markdown_field(@merge_request, :title)
|
||||
|
||||
- unless hide_gutter_toggle
|
||||
%div
|
||||
= render Pajamas::ButtonComponent.new(icon: "chevron-double-lg-left", button_options: { class: "btn-icon gl-float-right gl-display-block gutter-toggle issuable-gutter-toggle js-sidebar-toggle gl-md-display-none!" })
|
||||
= render Pajamas::ButtonComponent.new(icon: "chevron-double-lg-left", button_options: { class: "btn-icon gl-float-right gl-display-block gutter-toggle issuable-gutter-toggle js-sidebar-toggle gl-sm-display-none!" })
|
||||
|
||||
.detail-page-header-actions.gl-align-self-start.is-merge-request.js-issuable-actions.gl-display-flex
|
||||
- if can_update_merge_request
|
||||
- edit_action_description = _('Edit merge request')
|
||||
- edit_action_shortcut = 'e'
|
||||
- edit_button_title = "#{edit_action_description} <kbd class='flat ml-1' aria-hidden=true>#{edit_action_shortcut}</kbd>"
|
||||
= render Pajamas::ButtonComponent.new(href: edit_project_merge_request_path(@project, @merge_request), button_options: { aria: {label: edit_action_description, keyshortcuts: edit_action_shortcut}, class: "gl-display-none gl-md-display-block has-tooltip js-issuable-edit", data: { html: "true", testid: "edit-title-button" }, title: edit_button_title }) do
|
||||
= render Pajamas::ButtonComponent.new(href: edit_project_merge_request_path(@project, @merge_request), button_options: { aria: {label: edit_action_description, keyshortcuts: edit_action_shortcut}, class: "gl-display-none gl-sm-display-block gl-align-self-start has-tooltip js-issuable-edit", data: { html: "true", testid: "edit-title-button" }, title: edit_button_title }) do
|
||||
= _('Edit')
|
||||
|
||||
- if @merge_request.source_project
|
||||
= render 'projects/merge_requests/code_dropdown'
|
||||
.gl-display-flex.gl-flex-direction-column.gl-sm-flex-direction-row.gl-gap-3.gl-w-full.gl-sm-w-auto.gl-mt-2.gl-sm-mt-0
|
||||
- if @merge_request.source_project
|
||||
= render 'projects/merge_requests/code_dropdown'
|
||||
|
||||
- if current_user
|
||||
= render 'projects/merge_requests/close_reopen_draft_report_toggle'
|
||||
- if current_user
|
||||
= render 'projects/merge_requests/close_reopen_draft_report_toggle'
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
- access = note_human_max_access(note)
|
||||
- if note.noteable_author?(@noteable)
|
||||
= render Pajamas::BadgeComponent.new(_("Author"), variant: 'neutral', class: 'has-tooltip gl-bg-transparent! gl-inset-border-1-gray-100! gl-display-none gl-md-display-inline-block gl-mr-3', title: _("This user is the author of this %{noteable}.") % { noteable: @noteable.human_class_name })
|
||||
= render Pajamas::BadgeComponent.new(_("Author"), variant: 'neutral', class: 'has-tooltip gl-bg-transparent! !gl-shadow-inner-1-gray-100 gl-display-none gl-md-display-inline-block gl-mr-3', title: _("This user is the author of this %{noteable}.") % { noteable: @noteable.human_class_name })
|
||||
- if access
|
||||
= render Pajamas::BadgeComponent.new(access, variant: 'neutral', class: 'has-tooltip gl-bg-transparent! gl-inset-border-1-gray-100! gl-display-none gl-md-display-inline-block gl-mr-3', title: _("This user has the %{access} role in the %{name} project.") % { access: access.downcase, name: note.project_name })
|
||||
= render Pajamas::BadgeComponent.new(access, variant: 'neutral', class: 'has-tooltip gl-bg-transparent! !gl-shadow-inner-1-gray-100 gl-display-none gl-md-display-inline-block gl-mr-3', title: _("This user has the %{access} role in the %{name} project.") % { access: access.downcase, name: note.project_name })
|
||||
- elsif note.contributor?
|
||||
= render Pajamas::BadgeComponent.new(_("Contributor"), variant: 'neutral', class: 'has-tooltip gl-bg-transparent! gl-inset-border-1-gray-100! gl-display-none gl-md-display-inline-block gl-mr-3', title: _("This user has previously committed to the %{name} project.") % { name: note.project_name })
|
||||
= render Pajamas::BadgeComponent.new(_("Contributor"), variant: 'neutral', class: 'has-tooltip gl-bg-transparent! !gl-shadow-inner-1-gray-100 gl-display-none gl-md-display-inline-block gl-mr-3', title: _("This user has previously committed to the %{name} project.") % { name: note.project_name })
|
||||
|
||||
- if can?(current_user, :award_emoji, note)
|
||||
- if note.emoji_awardable?
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- if @project.pages_deployed?
|
||||
- if can?(current_user, :remove_pages, @project)
|
||||
.gl-bg-red-50.gl-inset-border-l-3-red-600.gl-py-5.gl-px-6
|
||||
.gl-bg-red-50.gl-shadow-inner-l-3-red-600.gl-py-5.gl-px-6
|
||||
%h4.gl-font-lg.gl-mt-0= s_('GitLabPages|Remove pages')
|
||||
%p= s_('GitLabPages|Removing pages will prevent them from being exposed to the outside world.')
|
||||
= render Pajamas::ButtonComponent.new(href: project_pages_path(@project),
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
= link_to group.full_name, group, class: 'group-name'
|
||||
|
||||
- if access&.nonzero?
|
||||
= render Pajamas::BadgeComponent.new(Gitlab::Access.human_access(access), variant: 'neutral', class: 'gl-bg-transparent! gl-inset-border-1-gray-100!')
|
||||
= render Pajamas::BadgeComponent.new(Gitlab::Access.human_access(access), variant: 'neutral', class: 'gl-bg-transparent! !gl-shadow-inner-1-gray-100')
|
||||
|
||||
- if group.description.present?
|
||||
.description
|
||||
|
|
|
|||
|
|
@ -61,4 +61,4 @@
|
|||
- if show_roles
|
||||
.controls.member-controls.gl-align-items-center
|
||||
= render_if_exists 'shared/members/ee/ldap_tag', can_override: member.can_override?
|
||||
= render Pajamas::BadgeComponent.new(member.human_access, variant: 'neutral', class: 'gl-bg-transparent! gl-inset-border-1-gray-100!')
|
||||
= render Pajamas::BadgeComponent.new(member.human_access, variant: 'neutral', class: 'gl-bg-transparent! !gl-shadow-inner-1-gray-100')
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
- if !explore_projects_tab? && access&.nonzero?
|
||||
-# haml-lint:disable UnnecessaryStringOutput
|
||||
= ' ' # prevent haml from eating the space between elements
|
||||
= render Pajamas::BadgeComponent.new(localized_project_human_access(access), variant: 'neutral', class: 'gl-bg-transparent! gl-inset-border-1-gray-100!', data: { testid: 'user-access-role' })
|
||||
= render Pajamas::BadgeComponent.new(localized_project_human_access(access), variant: 'neutral', class: 'gl-bg-transparent! !gl-shadow-inner-1-gray-100', data: { testid: 'user-access-role' })
|
||||
|
||||
- if !explore_projects_tab?
|
||||
= render_if_exists 'compliance_management/compliance_framework/compliance_framework_badge', project: project, additional_classes: 'gl-ml-2!'
|
||||
|
|
|
|||
|
|
@ -110,6 +110,20 @@ module.exports = {
|
|||
sm: '0 1px 2px var(--t-gray-a-08, #1f1e2414)',
|
||||
md: '0 2px 8px var(--t-gray-a-16, #1f1e2429), 0 0 2px var(--t-gray-a-16, #1f1e2429)',
|
||||
lg: '0 4px 12px var(--t-gray-a-16, #1f1e2429), 0 0 4px var(--t-gray-a-16, #1f1e2429)',
|
||||
|
||||
// TODO: backport these inset box shadows to GitLab UI
|
||||
'inner-1-gray-100': 'inset 0 0 0 1px var(--gray-100, #dcdcde)',
|
||||
'inner-1-gray-200': 'inset 0 0 0 1px var(--gray-200, #bfbfc3)',
|
||||
'inner-l-4-gray-100': 'inset 4px 0 0 0 var(--gray-100, #dcdcde)',
|
||||
'inner-1-red-400': 'inset 0 0 0 1px var(--red-400, #ec5941)',
|
||||
'inner-1-gray-400': 'inset 0 0 0 1px var(--gray-400, #89888d)',
|
||||
'inner-1-blue-500': 'inset 0 0 0 1px var(--blue-500, #1f75cb)',
|
||||
'inner-1-red-500': 'inset 0 0 0 1px var(--red-500, #dd2b0e)',
|
||||
'inner-l-3-red-600': 'inset 3px 0 0 0 var(--red-600, #c91c00)',
|
||||
'inner-b-2-theme-accent':
|
||||
'inset 0 -2px 0 0 var(--gl-theme-accent, var(--theme-indigo-500, #6666c4))',
|
||||
'x0-y2-b4-s0': '0 2px 4px 0 #0000001a',
|
||||
'x0-y0-b3-s1-blue-500': 'inset 0 0 3px 1px var(--blue-500, #1f75cb)',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class AddIndexToUserAddOnAssignmentsAddOnPurchaseIdAndId < Gitlab::Database::Migration[2.2]
|
||||
milestone '17.0'
|
||||
|
||||
disable_ddl_transaction!
|
||||
|
||||
INDEX_NAME = 'idx_user_add_on_assignments_on_add_on_purchase_id_and_id'
|
||||
|
||||
def up
|
||||
add_concurrent_index :subscription_user_add_on_assignments, [:add_on_purchase_id, :id], name: INDEX_NAME
|
||||
end
|
||||
|
||||
def down
|
||||
remove_concurrent_index_by_name :subscription_user_add_on_assignments, INDEX_NAME
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1 @@
|
|||
eed2d24b340c83ba299416d7b47f936294fe9d51de061874a2f0664201d6cdc2
|
||||
|
|
@ -24194,6 +24194,8 @@ CREATE INDEX idx_test_reports_on_issue_id_created_at_and_id ON requirements_mana
|
|||
|
||||
CREATE UNIQUE INDEX idx_uniq_analytics_dashboards_pointers_on_project_id ON analytics_dashboards_pointers USING btree (project_id);
|
||||
|
||||
CREATE INDEX idx_user_add_on_assignments_on_add_on_purchase_id_and_id ON subscription_user_add_on_assignments USING btree (add_on_purchase_id, id);
|
||||
|
||||
CREATE INDEX idx_user_credit_card_validations_on_holder_name_hash ON user_credit_card_validations USING btree (holder_name_hash);
|
||||
|
||||
CREATE INDEX idx_user_credit_card_validations_on_similar_to_meta_data ON user_credit_card_validations USING btree (expiration_date_hash, last_digits_hash, network_hash, credit_card_validated_at);
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Re-enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/27828) in GitLab 12.8.
|
||||
|
||||
Git protocol v2 improves the v1 wire protocol in several ways and is
|
||||
enabled by default in GitLab for HTTP requests. To enable SSH, additional
|
||||
configuration is required by an administrator.
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ To change the default local storage path location:
|
|||
You can store LFS objects in remote object storage. This allows you
|
||||
to reduce reads and writes to the local disk, and free up disk space significantly.
|
||||
|
||||
In GitLab 13.2 and later, you should use the
|
||||
You should use the
|
||||
[consolidated object storage settings](../object_storage.md#configure-a-single-storage-connection-for-all-object-types-consolidated-form).
|
||||
|
||||
### Migrating to object storage
|
||||
|
|
|
|||
|
|
@ -116,78 +116,8 @@ be configured already.
|
|||
|
||||
### Object Storage Settings
|
||||
|
||||
In GitLab 13.2 and later, you should use the
|
||||
You should use the
|
||||
[consolidated object storage settings](object_storage.md#configure-a-single-storage-connection-for-all-object-types-consolidated-form).
|
||||
This section describes the earlier configuration format.
|
||||
|
||||
For self-compiled installations, these settings are nested under `external_diffs:` and
|
||||
then `object_store:`. On Linux package installations, they are prefixed by
|
||||
`external_diffs_object_store_`.
|
||||
|
||||
| Setting | Description | Default |
|
||||
|---------|-------------|---------|
|
||||
| `enabled` | Enable/disable object storage | `false` |
|
||||
| `remote_directory` | The bucket name where external diffs are stored| |
|
||||
| `proxy_download` | Set to `true` to enable proxying all files served. Option allows to reduce egress traffic as this allows clients to download directly from remote storage instead of proxying all data | `false` |
|
||||
| `connection` | Various connection options described below | |
|
||||
|
||||
#### S3 compatible connection settings
|
||||
|
||||
See [the available connection settings for different providers](object_storage.md#configure-the-connection-settings).
|
||||
|
||||
::Tabs
|
||||
|
||||
:::TabTitle Linux package (Omnibus)
|
||||
|
||||
1. Edit `/etc/gitlab/gitlab.rb` and add the following lines by replacing with
|
||||
the values you want:
|
||||
|
||||
```ruby
|
||||
gitlab_rails['external_diffs_enabled'] = true
|
||||
gitlab_rails['external_diffs_object_store_enabled'] = true
|
||||
gitlab_rails['external_diffs_object_store_remote_directory'] = "external-diffs"
|
||||
gitlab_rails['external_diffs_object_store_connection'] = {
|
||||
'provider' => 'AWS',
|
||||
'region' => 'eu-central-1',
|
||||
'aws_access_key_id' => 'AWS_ACCESS_KEY_ID',
|
||||
'aws_secret_access_key' => 'AWS_SECRET_ACCESS_KEY'
|
||||
}
|
||||
```
|
||||
|
||||
If you are using AWS IAM profiles, omit the
|
||||
AWS access key and secret access key/value pairs. For example:
|
||||
|
||||
```ruby
|
||||
gitlab_rails['external_diffs_object_store_connection'] = {
|
||||
'provider' => 'AWS',
|
||||
'region' => 'eu-central-1',
|
||||
'use_iam_profile' => true
|
||||
}
|
||||
```
|
||||
|
||||
1. Save the file and [reconfigure GitLab](restart_gitlab.md#reconfigure-a-linux-package-installation) for the changes to take effect.
|
||||
|
||||
:::TabTitle Self-compiled (source)
|
||||
|
||||
1. Edit `/home/git/gitlab/config/gitlab.yml` and add or amend the following
|
||||
lines:
|
||||
|
||||
```yaml
|
||||
external_diffs:
|
||||
enabled: true
|
||||
object_store:
|
||||
enabled: true
|
||||
remote_directory: "external-diffs" # The bucket name
|
||||
connection:
|
||||
provider: AWS # Only AWS supported at the moment
|
||||
aws_access_key_id: AWS_ACCESS_KEY_ID
|
||||
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
|
||||
region: eu-central-1
|
||||
```
|
||||
|
||||
1. Save the file and [restart GitLab](restart_gitlab.md#self-compiled-installations) for the changes to take effect.
|
||||
|
||||
::EndTabs
|
||||
|
||||
## Alternative in-database storage
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,13 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/39060) in GitLab 12.8.
|
||||
|
||||
Merge request approval rules prevent users from overriding certain settings on the project level.
|
||||
When enabled at the instance level, these settings
|
||||
[cascade](../user/project/merge_requests/approvals/settings.md#cascade-settings-from-the-instance-or-top-level-group)
|
||||
and can no longer be changed:
|
||||
|
||||
- In projects.
|
||||
- In groups. Cascading to groups was [enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/285410)
|
||||
in GitLab 14.5.
|
||||
- In groups.
|
||||
|
||||
To enable merge request approval settings for an instance:
|
||||
|
||||
|
|
@ -43,4 +40,4 @@ Merge request approval settings that can be set at an instance level are:
|
|||
See also the following, which are affected by instance-level rules:
|
||||
|
||||
- [Project merge request approval rules](../user/project/merge_requests/approvals/index.md).
|
||||
- [Group merge request approval settings](../user/group/manage.md#group-merge-request-approval-settings) available in GitLab 13.9 and later.
|
||||
- [Group merge request approval settings](../user/group/manage.md#group-merge-request-approval-settings).
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299109) in GitLab 14.5 as an Experiment for self-managed customers.
|
||||
> - Ready for production use with [Cloud Native GitLab in GitLab 15.1](https://gitlab.com/gitlab-org/charts/gitlab/-/issues/2540) and [Linux packages in GitLab 15.9](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5937).
|
||||
|
||||
`gitlab-sshd` is [a standalone SSH server](https://gitlab.com/gitlab-org/gitlab-shell/-/tree/main/internal/sshd)
|
||||
|
|
|
|||
|
|
@ -77,9 +77,6 @@ This setting does not apply when pushing Git LFS objects.
|
|||
|
||||
## Personal access token prefix
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20968) in GitLab 13.7.
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/342327) in GitLab 14.5, a default prefix.
|
||||
|
||||
You can specify a prefix for personal access tokens. You might use a prefix
|
||||
to find tokens more quickly, or for use with automation tools.
|
||||
|
||||
|
|
@ -189,9 +186,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/296669) in GitLab 13.9.
|
||||
> - It's deployed behind a feature flag, disabled by default.
|
||||
|
||||
FLAG:
|
||||
On self-managed GitLab, by default this feature is not available. To make it available, an administrator can [enable the feature flag](../../administration/feature_flags.md) named `two_factor_for_cli`. On GitLab.com and GitLab Dedicated, this feature is not available. This feature is not ready for production use. This feature flag also affects [2FA for Git over SSH operations](../../security/two_factor_authentication.md#2fa-for-git-over-ssh-operations).
|
||||
|
||||
|
|
@ -211,10 +205,6 @@ DETAILS:
|
|||
**Tier:** Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1007) in GitLab 14.6 [with a flag](../../administration/feature_flags.md) named `ff_limit_ssh_key_lifetime`. Disabled by default.
|
||||
> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/346753) in GitLab 14.6.
|
||||
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/1007) in GitLab 14.7. [Feature flag `ff_limit_ssh_key_lifetime`](https://gitlab.com/gitlab-org/gitlab/-/issues/347408) removed.
|
||||
|
||||
Users can optionally specify a lifetime for
|
||||
[SSH keys](../../user/ssh.md).
|
||||
This lifetime is not a requirement, and can be set to any arbitrary number of days.
|
||||
|
|
@ -252,8 +242,6 @@ DETAILS:
|
|||
**Tier:** Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/3649) in GitLab 12.6.
|
||||
|
||||
Users can optionally specify a maximum lifetime in days for
|
||||
access tokens, this includes [personal](../../user/profile/personal_access_tokens.md),
|
||||
[group](../../user/group/settings/group_access_tokens.md), and [project](../../user/project/settings/project_access_tokens.md) access tokens.
|
||||
|
|
@ -290,8 +278,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/24605) in GitLab 12.7.
|
||||
|
||||
To maintain integrity of user details in [Audit Events](../../administration/audit_event_reports.md), GitLab administrators can choose to disable a user's ability to change their profile name.
|
||||
|
||||
To do this:
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68645) in GitLab 14.4.
|
||||
|
||||
Deprecated API endpoints are those which have been replaced with alternative
|
||||
functionality, but cannot be removed without breaking backward compatibility.
|
||||
Setting a restrictive rate limit on these endpoints can encourage users to
|
||||
|
|
|
|||
|
|
@ -10,9 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68561) in GitLab 14.3.
|
||||
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75918) in GitLab 14.6. [Feature flag `files_api_throttling`](https://gitlab.com/gitlab-org/gitlab/-/issues/338903) removed.
|
||||
|
||||
The [Repository files API](../../api/repository_files.md) enables you to
|
||||
fetch, create, update, and delete files in your repository. To improve the security
|
||||
and durability of your web application, you can enforce
|
||||
|
|
|
|||
|
|
@ -10,9 +10,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Improved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52360) to behave like group-level templates in GitLab 13.9.
|
||||
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/321247) in GitLab 14.0.
|
||||
|
||||
In hosted systems, enterprises often have a need to share their own templates
|
||||
across teams. This feature allows an administrator to pick a project to be the
|
||||
instance-wide collection of file templates. These templates are then exposed to
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31007) in GitLab 12.4.
|
||||
|
||||
Set the number of branches or tags to limit the number of single push events
|
||||
allowed at once. If the number of events is greater than this, GitLab creates
|
||||
bulk push event instead.
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78373) in GitLab 14.7 [with a flag](../feature_flags.md) named `rate_limit_gitlab_shell`. Available by default without a feature flag from 15.8.
|
||||
> - [Available by default](https://gitlab.com/gitlab-org/gitlab/-/issues/367998) in GitLab 15.8. [Feature flag](../feature_flags.md) `rate_limit_gitlab_shell` removed.
|
||||
|
||||
GitLab applies rate limits to Git operations that use SSH by user account and project. When the rate limit is exceeded, GitLab rejects
|
||||
further connection requests from that user for the project.
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/255449) in GitLab 14.2 for groups created after August 12, 2021.
|
||||
> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/352960) from default delayed project deletion in GitLab 15.1.
|
||||
> - [Enabled for projects in personal namespaces](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89466) in GitLab 15.1.
|
||||
> - [Disabled for projects in personal namespaces](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95495) in GitLab 15.3.
|
||||
|
|
@ -195,7 +194,7 @@ To restrict visibility levels for groups, projects, snippets, and selected pages
|
|||
- User profiles are only visible to authenticated users through the Web interface.
|
||||
- User attributes through the GraphQL API are:
|
||||
- Not visible in [GitLab 15.1 and later](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88020).
|
||||
- Only visible to authenticated users between [GitLab 13.1](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33195) and GitLab 15.0.
|
||||
- Visible only to authenticated users on GitLab 15.0.
|
||||
- If you restrict the **Internal** level:
|
||||
- Only administrators are able to create internal groups, projects, and snippets.
|
||||
- If you restrict the **Private** level:
|
||||
|
|
@ -242,8 +241,6 @@ allows the HTTP(S) protocol for Git clone or fetch requests performed [with GitL
|
|||
|
||||
## Customize Git clone URL for HTTP(S)
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18422) in GitLab 12.4.
|
||||
|
||||
You can customize project Git clone URLs for HTTP(S), which affects the clone
|
||||
panel:
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31025) in GitLab 12.3.
|
||||
|
||||
Configure GitLab to serve repository static objects (such as archives or raw blobs) from external
|
||||
storage such as a content delivery network (CDN).
|
||||
|
||||
|
|
|
|||
|
|
@ -362,8 +362,8 @@ Parameters:
|
|||
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding) owned by the authenticated user |
|
||||
| `sha` | string | yes | The commit hash |
|
||||
| `branch` | string | yes | The name of the branch |
|
||||
| `dry_run` | boolean | no | Does not commit any changes. Default is false. [Introduced in GitLab 13.3](https://gitlab.com/gitlab-org/gitlab/-/issues/231032) |
|
||||
| `message` | string | no | A custom commit message to use for the new commit. [Introduced in GitLab 14.0](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62481) |
|
||||
| `dry_run` | boolean | no | Does not commit any changes. Default is false. |
|
||||
| `message` | string | no | A custom commit message to use for the new commit. |
|
||||
|
||||
```shell
|
||||
curl --request POST \
|
||||
|
|
@ -437,7 +437,7 @@ Parameters:
|
|||
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding) |
|
||||
| `sha` | string | yes | Commit SHA to revert |
|
||||
| `branch` | string | yes | Target branch name |
|
||||
| `dry_run` | boolean | no | Does not commit any changes. Default is false. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/231032) in GitLab 13.3 |
|
||||
| `dry_run` | boolean | no | Does not commit any changes. Default is false. |
|
||||
|
||||
```shell
|
||||
curl --request POST \
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53016) in GitLab 13.9.
|
||||
|
||||
Group wiki repositories can be moved between storages. This API can help you, for example,
|
||||
[migrate to Gitaly Cluster](../administration/gitaly/index.md#migrate-to-gitaly-cluster)
|
||||
or migrate a [group wiki](../user/project/wiki/group.md). This API does not manage
|
||||
|
|
@ -213,7 +211,7 @@ Supported attributes:
|
|||
| Attribute | Type | Required | Description |
|
||||
| --------- | ---- | -------- | ----------- |
|
||||
| `group_id` | integer | yes | ID of the group. |
|
||||
| `destination_storage_name` | string | no | Name of the destination storage shard. In [GitLab 13.5 and later](https://gitlab.com/gitlab-org/gitaly/-/issues/3209), the storage is selected [based on storage weights](../administration/repository_storage_paths.md#configure-where-new-repositories-are-stored) if not provided. |
|
||||
| `destination_storage_name` | string | no | Name of the destination storage shard. The storage is selected [based on storage weights](../administration/repository_storage_paths.md#configure-where-new-repositories-are-stored) if not provided. |
|
||||
|
||||
Example request:
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - Changing approval configuration with the `/approvals` endpoint was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/11132) in GitLab 12.3.
|
||||
> - Endpoint `/approvals` [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/353097) in GitLab 16.0.
|
||||
|
||||
Configuration for
|
||||
|
|
@ -239,7 +238,7 @@ Example response:
|
|||
|
||||
## Project-level MR approvals
|
||||
|
||||
> - The `approvers` and `approver_groups` fields were deprecated in GitLab 12.3 and always return empty. Use the [project level approval rules](#get-project-level-rules) to access this information.
|
||||
> - Use the [project level approval rules](#get-project-level-rules) to access this information.
|
||||
|
||||
You can request information about a project's approval configuration using the
|
||||
following endpoint:
|
||||
|
|
@ -292,7 +291,7 @@ Supported attributes:
|
|||
|
||||
```json
|
||||
{
|
||||
"approvals_before_merge": 2, // Deprecated in GitLab 12.3, use Approval Rules instead
|
||||
"approvals_before_merge": 2, // Use Approval Rules instead
|
||||
"reset_approvals_on_push": true,
|
||||
"selective_code_owner_removals": false,
|
||||
"disable_overriding_approvers_per_merge_request": false,
|
||||
|
|
@ -964,8 +963,6 @@ Supported attributes:
|
|||
|
||||
### Get a single merge request level rule
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82767) in GitLab 14.10.
|
||||
|
||||
You can request information about a single merge request approval rule using the following endpoint:
|
||||
|
||||
```plaintext
|
||||
|
|
|
|||
|
|
@ -12,9 +12,7 @@ DETAILS:
|
|||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - `reference` was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20354) in GitLab 12.7.
|
||||
> - `draft` was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63473) as a replacement for `work_in_progress` in GitLab 14.0.
|
||||
> - `merged_by` was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/350534) in GitLab 14.7.
|
||||
> - `merge_user` was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/349031) as an eventual replacement for `merged_by` in GitLab 14.7.
|
||||
> - `merge_status` was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/3169#note_1162532204) in favor of `detailed_merge_status` in GitLab 15.6.
|
||||
> - `with_merge_status_recheck` [changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115948) in GitLab 15.11 [with a flag](../administration/feature_flags.md) named `restrict_merge_status_recheck` to be ignored for requests from users insufficient permissions. Disabled by default.
|
||||
> - `approvals_before_merge` was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119503) in GitLab 16.0.
|
||||
|
|
@ -215,7 +213,7 @@ Example response:
|
|||
|
||||
### Merge requests list response notes
|
||||
|
||||
- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31890) in GitLab 13.0, listing merge requests might
|
||||
- Listing merge requests might
|
||||
not proactively update `merge_status` (which also affects the `has_conflicts`), as this can be an expensive operation.
|
||||
If you need the value of these fields from this endpoint, set the `with_merge_status_recheck` parameter to
|
||||
`true` in the query.
|
||||
|
|
@ -256,7 +254,7 @@ Supported attributes:
|
|||
| `milestone` | string | No | Returns merge requests for a specific milestone. `None` returns merge requests with no milestone. `Any` returns merge requests that have an assigned milestone. |
|
||||
| `my_reaction_emoji` | string | No | Returns merge requests reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. |
|
||||
| `not` | Hash | No | Returns merge requests that do not match the parameters supplied. Accepts: `labels`, `milestone`, `author_id`, `author_username`, `assignee_id`, `assignee_username`, `reviewer_id`, `reviewer_username`, `my_reaction_emoji`. |
|
||||
| `order_by` | string | No | Returns requests ordered by `created_at`, `title` or `updated_at` fields. Default is `created_at`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/331625) in GitLab 14.8. |
|
||||
| `order_by` | string | No | Returns requests ordered by `created_at`, `title` or `updated_at` fields. Default is `created_at`. |
|
||||
| `reviewer_id` | integer | No | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/reviews/index.md) with the given user `id`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_username`. |
|
||||
| `reviewer_username` | string | No | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/reviews/index.md) with the given `username`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_id`. |
|
||||
| `scope` | string | No | Returns merge requests for the given scope: `created_by_me`, `assigned_to_me`, or `all`. |
|
||||
|
|
@ -443,7 +441,7 @@ Supported attributes:
|
|||
| `my_reaction_emoji` | string | No | Returns merge requests reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. |
|
||||
| `non_archived` | boolean | No | Returns merge requests from non archived projects only. Default is `true`. |
|
||||
| `not` | Hash | No | Returns merge requests that do not match the parameters supplied. Accepts: `labels`, `milestone`, `author_id`, `author_username`, `assignee_id`, `assignee_username`, `reviewer_id`, `reviewer_username`, `my_reaction_emoji`. |
|
||||
| `order_by` | string | No | Returns merge requests ordered by `created_at`, `title` or `updated_at` fields. Default is `created_at`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/331625) in GitLab 14.8. |
|
||||
| `order_by` | string | No | Returns merge requests ordered by `created_at`, `title` or `updated_at` fields. Default is `created_at`. |
|
||||
| `reviewer_id` | integer | No | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/reviews/index.md) with the given user `id`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_username`. |
|
||||
| `reviewer_username` | string | No | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/reviews/index.md) with the given `username`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_id`. |
|
||||
| `scope` | string | No | Returns merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`. |
|
||||
|
|
@ -636,7 +634,7 @@ Supported attributes:
|
|||
| `latest_build_started_at` | datetime | Timestamp of when the latest build for the merge request started. |
|
||||
| `merge_commit_sha` | string | SHA of the merge request commit. Returns `null` until merged. |
|
||||
| `merge_error` | string | Error message shown when a merge has failed. To check mergeability, use `detailed_merge_status` instead |
|
||||
| `merge_user` | object | The user who merged this merge request, the user who set it to auto-merge, or `null`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/349031) in GitLab 14.7. |
|
||||
| `merge_user` | object | The user who merged this merge request, the user who set it to auto-merge, or `null`. |
|
||||
| `merge_status` | string | Status of the merge request. Can be `unchecked`, `checking`, `can_be_merged`, `cannot_be_merged`, or `cannot_be_merged_recheck`. Affects the `has_conflicts` property. For important notes on response data, see [Single merge request response notes](#single-merge-request-response-notes). [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/3169#note_1162532204) in GitLab 15.6. Use `detailed_merge_status` instead. |
|
||||
| `merge_when_pipeline_succeeds` | boolean | Indicates if the merge has been set to be merged when its pipeline succeeds. |
|
||||
| `merged_at` | datetime | Timestamp of when the merge request was merged. |
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ This API is a project-specific version of these endpoints:
|
|||
- [GitLab CI/CD Configuration templates](templates/gitlab_ci_ymls.md)
|
||||
- [Open source license templates](templates/licenses.md)
|
||||
- [Issue and merge request templates](../user/project/description_templates.md)
|
||||
([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37890) in GitLab 13.3)
|
||||
|
||||
It deprecates these endpoints, which are scheduled for removal in API version 5.
|
||||
|
||||
|
|
|
|||
|
|
@ -58,8 +58,6 @@ Example response:
|
|||
|
||||
## Get a single project's remote mirror
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82770) in GitLab 14.10.
|
||||
|
||||
Returns a remote mirror and its statuses:
|
||||
|
||||
```plaintext
|
||||
|
|
@ -216,8 +214,6 @@ An empty response with a HTTP response code 204.
|
|||
|
||||
## Delete a remote mirror
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82778) in GitLab 14.10.
|
||||
|
||||
Delete a remote mirror.
|
||||
|
||||
```plaintext
|
||||
|
|
|
|||
|
|
@ -132,9 +132,6 @@ Supported attributes:
|
|||
|
||||
## Get file archive
|
||||
|
||||
> - Support for [including Git LFS blobs](../topics/git/lfs/index.md#lfs-objects-in-project-archives) was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15079) in GitLab 13.5.
|
||||
> - Support for downloading a subfolder was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/28827) in GitLab 14.4.
|
||||
|
||||
Get an archive of the repository. This endpoint can be accessed without
|
||||
authentication if the repository is publicly accessible.
|
||||
|
||||
|
|
@ -235,9 +232,6 @@ Example response:
|
|||
|
||||
## Contributors
|
||||
|
||||
> - Attributes `additions` and `deletions` [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39653) in GitLab 13.4, because they [always returned `0`](https://gitlab.com/gitlab-org/gitlab/-/issues/233119).
|
||||
> - Attributes `additions` and `deletions` [removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38920) in GitLab 14.0.
|
||||
|
||||
Get repository contributors list. This endpoint can be accessed without
|
||||
authentication if the repository is publicly accessible.
|
||||
|
||||
|
|
@ -312,7 +306,6 @@ Example response:
|
|||
|
||||
## Add changelog data to a changelog file
|
||||
|
||||
> - [Introduced](https://gitlab.com/groups/gitlab-com/gl-infra/-/epics/351) in GitLab 13.9.
|
||||
> - Commit range limits [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89032) in GitLab 15.1 [with a flag](../administration/feature_flags.md) named `changelog_commits_limitation`. Enabled by default.
|
||||
|
||||
Generate changelog data based on commits in a repository.
|
||||
|
|
@ -435,8 +428,6 @@ curl --request POST --header "PRIVATE-TOKEN: token" \
|
|||
|
||||
## Generate changelog data
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/345934) in GitLab 14.6.
|
||||
|
||||
Generate changelog data based on commits in a repository, without committing
|
||||
them to a changelog file.
|
||||
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@ in the following table.
|
|||
|
||||
## Get file from repository
|
||||
|
||||
> - The `execute_filemode` field in the response was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83499) in GitLab 14.10.
|
||||
|
||||
Allows you to receive information about file in repository like name, size, and
|
||||
content. File content is Base64 encoded. This endpoint can be accessed
|
||||
without authentication if the repository is publicly accessible.
|
||||
|
|
@ -230,8 +228,6 @@ Like [Get file from repository](repository_files.md#get-file-from-repository), y
|
|||
|
||||
## Create new file in repository
|
||||
|
||||
> - The `execute_filemode` parameter was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83499) in GitLab 14.10.
|
||||
|
||||
Allows you to create a single file. For creating multiple files with a single request,
|
||||
refer to the [commits API](commits.md#create-a-commit-with-multiple-files-and-actions).
|
||||
|
||||
|
|
@ -271,8 +267,6 @@ Example response:
|
|||
|
||||
## Update existing file in repository
|
||||
|
||||
> - The `execute_filemode` parameter was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83499) in GitLab 14.10.
|
||||
|
||||
Allows you to update a single file. For updating multiple files with a single request,
|
||||
refer to the [commits API](commits.md#create-a-commit-with-multiple-files-and-actions).
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49228) in GitLab 13.8.
|
||||
|
||||
Snippet repositories can be moved between storages. This API can help you when
|
||||
[migrating to Gitaly Cluster](../administration/gitaly/index.md#migrate-to-gitaly-cluster), for
|
||||
example.
|
||||
|
|
@ -217,8 +215,6 @@ Example response:
|
|||
|
||||
## Schedule a repository storage move for a snippet
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49228) in GitLab 13.8.
|
||||
|
||||
```plaintext
|
||||
POST /snippets/:snippet_id/repository_storage_moves
|
||||
```
|
||||
|
|
@ -228,7 +224,7 @@ Supported attributes:
|
|||
| Attribute | Type | Required | Description |
|
||||
| --------- | ---- | -------- | ----------- |
|
||||
| `snippet_id` | integer | yes | ID of the snippet. |
|
||||
| `destination_storage_name` | string | no | Name of the destination storage shard. In [GitLab 13.5 and later](https://gitlab.com/gitlab-org/gitaly/-/issues/3209), the storage is selected [automatically based on storage weights](../administration/repository_storage_paths.md#configure-where-new-repositories-are-stored) if not provided. |
|
||||
| `destination_storage_name` | string | no | Name of the destination storage shard. The storage is selected [automatically based on storage weights](../administration/repository_storage_paths.md#configure-where-new-repositories-are-stored) if not provided. |
|
||||
|
||||
Example request:
|
||||
|
||||
|
|
@ -266,8 +262,6 @@ Example response:
|
|||
|
||||
## Schedule repository storage moves for all snippets on a storage shard
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49228) in GitLab 13.8.
|
||||
|
||||
Schedules repository storage moves for each snippet repository stored on the source storage shard.
|
||||
This endpoint migrates all snippets at once. For more information, see
|
||||
[Move all snippets](../administration/operations/moving_repositories.md#move-all-snippets).
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ When an older deployment job starts, it fails and is labeled:
|
|||
- `The deployment job is older than the latest deployment, and therefore failed.`
|
||||
when viewing the completed job.
|
||||
|
||||
When an older deployment job is manual, the play button is disabled with a message
|
||||
When an older deployment job is manual, the **Run** (**{play}**) button is disabled with a message
|
||||
`This deployment job does not run automatically and must be started manually, but it's older than the latest deployment, and therefore can't run.`.
|
||||
|
||||
Job age is determined by the job start time, not the commit time, so a newer commit
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
|
|
@ -66,12 +66,9 @@ rollout 10%:
|
|||
ROLLOUT_PERCENTAGE: 10
|
||||
```
|
||||
|
||||
When the jobs are built, a **play** button appears next to the job's name. Select **play**
|
||||
After the jobs are built, select **Run** (**{play}**) next to the job's name
|
||||
to release each stage of pods. You can also rollback by running a lower percentage job. Once 100%
|
||||
is reached, you cannot roll back using this method. It is still possible to roll back by redeploying
|
||||
the old version using the **Rollback** button on the environment page.
|
||||
|
||||

|
||||
is reached, you cannot roll back using this method. To roll back a deployment, see [retry or roll back a deployment](../../ci/environments/index.md#retry-or-roll-back-a-deployment).
|
||||
|
||||
A [deployable application](https://gitlab.com/gl-release/incremental-rollout-example) is
|
||||
available, demonstrating manually triggered incremental rollouts.
|
||||
|
|
|
|||
|
|
@ -304,10 +304,10 @@ deploy_prod:
|
|||
|
||||
The `when: manual` action:
|
||||
|
||||
- Exposes a play button for the job in the GitLab UI, with the text **Can be manually deployed to <environment>**.
|
||||
- Means the `deploy_prod` job is only triggered when the play button is selected.
|
||||
- Exposes the **Run** (**{play}**) button for the job in the GitLab UI, with the text **Can be manually deployed to <environment>**.
|
||||
- Means the `deploy_prod` job must be triggered manually.
|
||||
|
||||
You can find the play button in the pipelines, environments, deployments, and jobs views.
|
||||
You can find **Run** (**{play}**) in the pipelines, environments, deployments, and jobs views.
|
||||
|
||||
## Track newly included merge requests per deployment
|
||||
|
||||
|
|
|
|||
|
|
@ -632,7 +632,7 @@ Select it to see the runner's output.
|
|||
|
||||

|
||||
|
||||
After our code passed through the pipeline successfully, we can deploy to our production server by selecting the **play** button on the right side.
|
||||
After our code passed through the pipeline successfully, we can deploy to our production server by selecting **Run** (**{play}**) on the right side.
|
||||
|
||||

|
||||
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ When running manual jobs you can supply additional job specific variables.
|
|||
|
||||
You can do this from the job page of the manual job you want to run with
|
||||
additional variables. To access this page, select the **name** of the manual job in
|
||||
the pipeline view, *not* the play (**{play}**) button.
|
||||
the pipeline view, *not* **Run** (**{play}**).
|
||||
|
||||
Define CI/CD variables here when you want to alter the execution of a job that uses
|
||||
[CI/CD variables](../variables/index.md).
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ To run a manual job, you must have permission to merge to the assigned branch:
|
|||
|
||||
1. Go to the pipeline, job, [environment](../environments/index.md#configure-manual-deployments),
|
||||
or deployment view.
|
||||
1. Next to the manual job, select **Play** (**{play}**).
|
||||
1. Next to the manual job, select **Run** (**{play}**).
|
||||
|
||||
You can also [add custom CI/CD variables when running a manual job](index.md#specifying-variables-when-running-manual-jobs).
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ timed rollout 10%:
|
|||
To stop the active timer of a delayed job, select **Unschedule** (**{time-out}**).
|
||||
This job can no longer be scheduled to run automatically. You can, however, execute the job manually.
|
||||
|
||||
To start a delayed job manually, select **Unschedule** (**{time-out}**) to stop the delay timer and then select **Play** (**{play}**).
|
||||
To start a delayed job manually, select **Unschedule** (**{time-out}**) to stop the delay timer and then select **Run** (**{play}**).
|
||||
Soon GitLab Runner starts the job.
|
||||
|
||||
## Parallelize large jobs
|
||||
|
|
|
|||
|
|
@ -200,8 +200,7 @@ For each `var` or `file_var`, a key and value are required.
|
|||
[Manual jobs](../jobs/job_control.md#create-a-job-that-must-be-run-manually),
|
||||
allow you to require manual interaction before moving forward in the pipeline.
|
||||
|
||||
You can do this straight from the pipeline graph. Just select the play button
|
||||
to execute that particular job.
|
||||
You can do this straight from the pipeline graph. Select **Run** (**{play}**) to execute that particular job.
|
||||
|
||||
For example, your pipeline can start automatically, but require a manual action to
|
||||
[deploy to production](../environments/index.md#configure-manual-deployments).
|
||||
|
|
@ -212,7 +211,7 @@ In the example below, the `production` stage has a job with a manual action:
|
|||
#### Start all manual jobs in a stage
|
||||
|
||||
If a stage contains only manual jobs, you can start all the jobs at the same time
|
||||
by selecting **Play all manual** (**{play}**) above the stage. If the stage contains
|
||||
by selecting **Run all manual** (**{play}**) above the stage. If the stage contains
|
||||
non-manual jobs, the option is not displayed.
|
||||
|
||||
### Skip a pipeline
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ the next scheduled time:
|
|||
1. On the left sidebar, select **Search or go to** and find your project.
|
||||
1. Select **Build > Pipeline schedules**.
|
||||
1. On the right of the list, for
|
||||
the pipeline you want to run, select **Play** (**{play}**).
|
||||
the pipeline you want to run, select **Run** (**{play}**).
|
||||
|
||||
You can manually run scheduled pipelines once per minute.
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ info: Any user with at least the Maintainer role can merge updates to this conte
|
|||
|
||||
# Code intelligence development guidelines
|
||||
|
||||
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/1576) in GitLab 13.1.
|
||||
|
||||
This document describes the design behind [Code Intelligence](../../user/project/code_intelligence.md).
|
||||
|
||||
The built-in Code Intelligence in GitLab is powered by
|
||||
|
|
|
|||
|
|
@ -582,7 +582,12 @@ experience, refactors the existing code). Then:
|
|||
- Consider using the [Conventional Comment format](https://conventionalcomments.org#format) to
|
||||
convey your intent.
|
||||
- For non-mandatory suggestions, decorate with (non-blocking) so the author knows they can
|
||||
optionally resolve within the merge request or follow-up at a later stage.
|
||||
optionally resolve within the merge request or follow-up at a later stage. When the only suggestions are
|
||||
non-blocking, move the MR onto the next stage to reduce async cycles. When you are a first round
|
||||
reviewer, pass to a maintainer to review. When you are the final approving maintainer,
|
||||
generate follow-ups from the non-blocking suggestions and merge or set auto-merge.
|
||||
The author then has the option to either cancel the auto-merge by implementing the non-blocking suggestions,
|
||||
they provide a follow-up MR after the MR got merged, or decide to not implement the suggestions.
|
||||
- There's a [Chrome/Firefox add-on](https://gitlab.com/conventionalcomments/conventional-comments-button) which you can use to apply [Conventional Comment](https://conventionalcomments.org/) prefixes.
|
||||
- Ensure there are no open dependencies. Check [linked issues](../user/project/issues/related_issues.md) for blockers. Clarify with the authors
|
||||
if necessary. If blocked by one or more open MRs, set an [MR dependency](../user/project/merge_requests/dependencies.md).
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ info: Any user with at least the Maintainer role can merge updates to this conte
|
|||
|
||||
# Merge request widget extensions
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44616) in GitLab 13.6.
|
||||
|
||||
Extensions in the merge request widget enable you to add new features
|
||||
into the merge request widget that match the design framework.
|
||||
With extensions we get a lot of benefits out of the box without much effort required, like:
|
||||
|
|
|
|||
|
|
@ -465,7 +465,6 @@ Example response:
|
|||
|
||||
## GitLab agent endpoints
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41045) in GitLab 13.4.
|
||||
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/432773) in GitLab 16.7.
|
||||
|
||||
The following endpoints are used by the GitLab agent server (`kas`)
|
||||
|
|
@ -1259,8 +1258,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** GitLab.com
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/9388) in GitLab 11.10.
|
||||
|
||||
The group SCIM API partially implements the [RFC7644 protocol](https://www.rfc-editor.org/rfc/rfc7644). This API provides the `/groups/:group_path/Users` and `/groups/:group_path/Users/:id` endpoints. The base URL is `<http|https>://<GitLab host>/api/scim/v2`. Because this API is for
|
||||
**system** use for SCIM provider integration, it is subject to change without notice.
|
||||
|
||||
|
|
|
|||
|
|
@ -154,8 +154,6 @@ details may have changed, it should still serve as a good introduction.
|
|||
|
||||
## Including LFS blobs in project archives
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15079) in GitLab 13.5.
|
||||
|
||||
The following diagram illustrates how GitLab resolves LFS files for project archives:
|
||||
|
||||
```mermaid
|
||||
|
|
@ -211,7 +209,7 @@ sequenceDiagram
|
|||
1. The archive data is sent back to the client.
|
||||
|
||||
In step 7, the `gitaly-lfs-smudge` filter must talk to Workhorse, not to
|
||||
Rails, or an invalid LFS blob is saved. To support this, GitLab 13.5
|
||||
Rails, or an invalid LFS blob is saved. To support this, GitLab
|
||||
[changed the default Omnibus configuration to have Gitaly talk to the Workhorse](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/4592)
|
||||
instead of Rails.
|
||||
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ The merge request diff still contains the `file_a` removal while the actual diff
|
|||
`main`'s `HEAD` has only the `file_b` removal. The diff with such redundant
|
||||
changes is harder to review.
|
||||
|
||||
In order to display an up-to-date diff, in GitLab 12.9 we
|
||||
To display an up-to-date diff we
|
||||
[introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/27008) merge request
|
||||
diffs compared against `HEAD` of the target branch: the
|
||||
target branch is artificially merged into the source branch, then the resulting
|
||||
|
|
|
|||
|
|
@ -10,9 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/228893) in GitLab 13.4.
|
||||
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/258206) in GitLab 13.8
|
||||
|
||||
With [Gitpod](https://www.gitpod.io/), you can describe your development environment as code to get fully
|
||||
set up, compiled, and tested development environments for any GitLab project. The development
|
||||
environments are not only automated but also prebuilt which means that Gitpod continuously builds
|
||||
|
|
|
|||
|
|
@ -10,10 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556) in GitLab 12.5 [with a flag](../administration/feature_flags.md) named `sourcegraph`. Disabled by default.
|
||||
> - Enabled on GitLab.com in GitLab 12.5.
|
||||
> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73116) in GitLab 14.8.
|
||||
|
||||
FLAG:
|
||||
On self-managed GitLab, by default this feature is available. To hide the feature, an administrator can [disable the feature flag](../administration/feature_flags.md) named `sourcegraph`.
|
||||
On GitLab.com, this feature is available for public projects only.
|
||||
|
|
|
|||
|
|
@ -445,8 +445,6 @@ It's possible to generate diagrams and flowcharts from text in GitLab using
|
|||
|
||||
#### Mermaid
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31818) in GitLab 13.3.
|
||||
|
||||
Visit the [official page](https://mermaidjs.github.io/) for more details.
|
||||
If you're new to using Mermaid or need help identifying issues in your Mermaid code,
|
||||
the [Mermaid Live Editor](https://mermaid-js.github.io/mermaid-live-editor/) is a helpful tool
|
||||
|
|
|
|||
|
|
@ -182,8 +182,6 @@ If an issue or merge request is closed with a locked discussion, then you cannot
|
|||
|
||||
## Add an internal note
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207473) in GitLab 13.9 [with a flag](../../administration/feature_flags.md) named `confidential_notes`. Disabled by default.
|
||||
> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/351143) in GitLab 14.10: you can only mark comments in issues and epics as confidential. Previously, it was also possible for comments in merge requests and snippets.
|
||||
> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87403) from "confidential comments" to "internal notes" in GitLab 15.0.
|
||||
> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87383) in GitLab 15.0.
|
||||
> - [Feature flag `confidential_notes`](https://gitlab.com/gitlab-org/gitlab/-/issues/362712) removed in GitLab 15.2.
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6861) in GitLab 11.6.
|
||||
|
||||
When you create a project, you can [choose from a list of templates](../project/index.md).
|
||||
These templates, for things like GitLab Pages or Ruby, populate the new project with a copy of the files contained in the
|
||||
template. This information is identical to the information used by [GitLab project import/export](../project/settings/import_export.md)
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ and cascade to all projects by default.
|
|||
To enable product analytics on your instance:
|
||||
|
||||
1. On the left sidebar, at the bottom, select **Admin Area**.
|
||||
1. Select **Settings > General**.
|
||||
1. Select **Settings > Analytics**.
|
||||
1. Expand **Product analytics** and enter the configuration values.
|
||||
1. Select **Save changes**.
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - GraphQL support [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/352956) in GitLab 14.9 [with a flag](../../administration/feature_flags.md) named `saved_replies`. Disabled by default.
|
||||
> - User interface [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113232) in GitLab 15.10 [with a flag](../../administration/feature_flags.md) named `saved_replies`. Disabled by default. Enabled for GitLab team members only.
|
||||
> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119468) in GitLab 16.0.
|
||||
> - [Feature flag `saved_replies` removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123363) in GitLab 16.6.
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/36705) in GitLab 13.9: you can search using the full name in user autocomplete.
|
||||
|
||||
The autocomplete characters provide a quick way of entering field values into
|
||||
Markdown fields. When you start typing a word in a Markdown field with one of
|
||||
the following characters, GitLab progressively autocompletes against a set of
|
||||
|
|
|
|||
|
|
@ -46,10 +46,6 @@ To view or edit merge request approval settings for a single project:
|
|||
|
||||
### Cascade settings from the instance or top-level group
|
||||
|
||||
> - Cascading settings [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/285410) in GitLab 14.4. [Deployed behind the `group_merge_request_approval_settings_feature_flag` flag](../../../../administration/feature_flags.md), disabled by default.
|
||||
> - Cascading settings [enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/285410) in GitLab 14.5.
|
||||
> - [Feature flag `group_merge_request_approval_settings_feature_flag`](https://gitlab.com/gitlab-org/gitlab/-/issues/343872) removed in GitLab 14.9.
|
||||
|
||||
To simplify the management of approval rule settings, configure the approval rules
|
||||
at the broadest possible level. Rules created:
|
||||
|
||||
|
|
|
|||
|
|
@ -218,9 +218,6 @@ a merge request. You can choose to hide or show whitespace changes:
|
|||
|
||||
## Mark files as viewed
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51513) in GitLab 13.9 [with a flag](../../../administration/feature_flags.md) named `local_file_reviews`. Enabled by default.
|
||||
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/296674) in GitLab 14.3.
|
||||
|
||||
When reviewing a merge request with many files multiple times, you can ignore files
|
||||
you've already reviewed. To hide files that haven't changed since your last review:
|
||||
|
||||
|
|
@ -236,7 +233,6 @@ Files marked as viewed are not shown to you again unless either:
|
|||
|
||||
## Show merge request conflicts in diff
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232484) in GitLab 13.5 [with a flag](../../../administration/feature_flags.md) named `display_merge_conflicts_in_diff`. Disabled by default.
|
||||
> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/276918) in GitLab 15.7.
|
||||
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/276918) in GitLab 15.8. Feature flag `display_merge_conflicts_in_diff` removed.
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> Feature flag `pick_into_project` [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/324154) in GitLab 14.0.
|
||||
|
||||
In Git, *cherry-picking* is taking a single commit from one branch and adding it
|
||||
as the latest commit on another branch. The rest of the commits in the source branch
|
||||
are not added to the target. Cherry-pick a commit when you need the
|
||||
|
|
|
|||
|
|
@ -10,9 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/20263) in GitLab 14.5.
|
||||
> - Squash commit templates [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/345275) in GitLab 14.6.
|
||||
|
||||
GitLab uses commit templates to create default messages for specific types of
|
||||
commits. These templates encourage commit messages to follow a particular format,
|
||||
or contain specific information. Users can override these templates when merging
|
||||
|
|
@ -68,11 +65,6 @@ GitLab creates a squash commit message with this template:
|
|||
|
||||
## Supported variables in commit templates
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/20263) in GitLab 14.5.
|
||||
> - `first_commit` and `first_multiline_commit` variables [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/346805) in GitLab 14.6.
|
||||
> - `url`, `approved_by`, and `merged_by` variables [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75639) in GitLab 14.7.
|
||||
> - `co_authored_by` variable [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/20421) in GitLab 14.7.
|
||||
> - `all_commits` variable [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/26303) in GitLab 14.9.
|
||||
> - `reviewed_by` variable [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/378352) in GitLab 15.7.
|
||||
> - `local_reference` variable [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/199823) in GitLab 16.1.
|
||||
> - `source_project_id` variables [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128553) in GitLab 16.3.
|
||||
|
|
|
|||
|
|
@ -37,9 +37,6 @@ need to [include more commits for context](#show-commits-from-previous-merge-req
|
|||
|
||||
### Show commits from previous merge requests
|
||||
|
||||
> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/320757) in GitLab 14.8.
|
||||
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/320757) in GitLab 14.9. [Feature flag `context_commits`](https://gitlab.com/gitlab-org/gitlab/-/issues/320757) removed.
|
||||
|
||||
When you review a merge request, you might need information from previous commits
|
||||
to help understand the commits you're reviewing. You might need more context
|
||||
if another merge request:
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/58583) in GitLab 12.1.
|
||||
|
||||
Merge requests in a public repository are also public, even when the merge
|
||||
request is created for a [confidential issue](../issues/confidential_issues.md).
|
||||
To avoid leaking confidential information when working on a confidential issue,
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@ already exists for this branch, a link to the existing merge request is shown.
|
|||
|
||||
## From an issue
|
||||
|
||||
> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/349566) the behavior of the **Create merge request** button to open the merge request creation form in GitLab 14.8.
|
||||
|
||||
If your development workflow requires an issue for every merge
|
||||
request, you can create a branch directly from the issue to speed the process up.
|
||||
The new branch, and later its merge request, are marked as related to this issue.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ cannot merge until the **Draft** flag is removed, even if all other merge criter
|
|||
|
||||
## Mark merge requests as drafts
|
||||
|
||||
> - [Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/228685) all support for the term **WIP** in GitLab 14.8.
|
||||
> - `/draft` quick action as a toggle [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92654) in GitLab 15.4.
|
||||
> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108073) the draft status to use a checkbox in GitLab 15.8.
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - Sidebar actions menu [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85584) in GitLab 14.10 [with a flag](../../../administration/feature_flags.md) named `moved_mr_sidebar`. Enabled by default.
|
||||
> - Sidebar actions menu [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/373757) to also move actions on issues, incidents, and epics in GitLab 16.0.
|
||||
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127001) in GitLab 16.9. Feature flag `moved_mr_sidebar` removed.
|
||||
|
||||
|
|
|
|||
|
|
@ -222,7 +222,6 @@ considered equivalent to rebasing.
|
|||
|
||||
### Rebase without CI/CD pipeline
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/118825) in GitLab 14.7 [with a flag](../../../../administration/feature_flags.md) named `rebase_without_ci_ui`. Disabled by default.
|
||||
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/350262) in GitLab 15.3. Feature flag `rebase_without_ci_ui` removed.
|
||||
|
||||
To rebase a merge request's branch without triggering a CI/CD pipeline, select
|
||||
|
|
|
|||
|
|
@ -184,8 +184,6 @@ For example, to customize the commit message to output
|
|||
|
||||
## Batch suggestions
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/326168) custom commit messages for batch suggestions in GitLab 14.4.
|
||||
|
||||
Prerequisites:
|
||||
|
||||
- You must have a role in the project that allows you to commit to the source branch.
|
||||
|
|
@ -206,7 +204,7 @@ suggestions in a single commit.
|
|||
approver for this merge request.
|
||||
|
||||
1. Optional. Provide a custom commit message for [batch suggestions](#batch-suggestions)
|
||||
(GitLab 14.4 and later) to describe your change. If you don't specify one,
|
||||
to describe your change. If you don't specify one,
|
||||
the default commit message is used.
|
||||
|
||||
## Related topics
|
||||
|
|
|
|||
|
|
@ -242,10 +242,6 @@ You can allow everyone with write access to push to the protected branch.
|
|||
|
||||
## Allow deploy keys to push to a protected branch
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/30769) in GitLab 13.7.
|
||||
> - This feature was selectively deployed in GitLab.com 13.7, and may not be available for all users.
|
||||
> - This feature is available for all users in GitLab 13.9.
|
||||
|
||||
You can permit the owner of a [deploy key](deploy_keys/index.md) to push to a protected branch.
|
||||
The deploy key works, even if the user isn't a member of the related project. However, the owner of the deploy
|
||||
key must have at least read access to the project.
|
||||
|
|
@ -273,9 +269,6 @@ Deploy keys are not available in the **Allowed to merge** dropdown list.
|
|||
|
||||
## Allow force push on a protected branch
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15611) in GitLab 13.10 [with a flag](../../administration/feature_flags.md) named `allow_force_push_to_protected_branches`. Disabled by default.
|
||||
> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/323431) in GitLab 14.0. Feature flag `allow_force_push_to_protected_branches` removed.
|
||||
|
||||
You can allow [force pushes](../../topics/git/git_rebase.md#force-pushing) to
|
||||
protected branches.
|
||||
|
||||
|
|
@ -330,8 +323,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/35097) in GitLab 13.5, users and groups who can push to protected branches do not have to use a merge request to merge their feature branches. This means they can skip merge request approval rules.
|
||||
|
||||
For a protected branch, you can require at least one approval by a [Code Owner](codeowners/index.md).
|
||||
If a branch is protected by multiple rules, code owner approval is required if _any_ of
|
||||
the applicable rules have **Required approval from code owners** enabled.
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Git push options can perform actions for merge requests while pushing changes:
|
|||
| `merge_request.title="<title>"` | Set the title of the merge request. For example: `git push -o merge_request.title="The title I want"`. |
|
||||
| `merge_request.description="<description>"` | Set the description of the merge request. For example: `git push -o merge_request.description="The description I want"`. |
|
||||
| `merge_request.draft` | Mark the merge request as a draft. For example: `git push -o merge_request.draft`. Introduced in [GitLab 15.0](https://gitlab.com/gitlab-org/gitlab/-/issues/296673). |
|
||||
| `merge_request.milestone="<milestone>"` | Set the milestone of the merge request. For example: `git push -o merge_request.milestone="3.0"`. Introduced in [GitLab 14.1](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63960). |
|
||||
| `merge_request.milestone="<milestone>"` | Set the milestone of the merge request. For example: `git push -o merge_request.milestone="3.0"`. |
|
||||
| `merge_request.label="<label>"` | Add labels to the merge request. If the label does not exist, it is created. For example, for two labels: `git push -o merge_request.label="label1" -o merge_request.label="label2"`. |
|
||||
| `merge_request.unlabel="<label>"` | Remove labels from the merge request. For example, for two labels: `git push -o merge_request.unlabel="label1" -o merge_request.unlabel="label2"`. |
|
||||
| `merge_request.assign="<user>"` | Assign users to the merge request. Accepts username or user ID. For example, for two users: `git push -o merge_request.assign="user1" -o merge_request.assign="user2"`. Support for usernames added in [GitLab 15.5](https://gitlab.com/gitlab-org/gitlab/-/issues/344276). |
|
||||
|
|
|
|||
|
|
@ -31,9 +31,7 @@ using the GitLab default only if no customizations are set:
|
|||
1. A [subgroup-level](#group-level-custom-initial-branch-name) custom default branch name.
|
||||
1. A [group-level](#group-level-custom-initial-branch-name) custom default branch name.
|
||||
1. An [instance-level](#instance-level-custom-initial-branch-name) custom default branch name.
|
||||
1. If no custom default branch name is set at any level, GitLab defaults to:
|
||||
- `main`: Projects created with GitLab 14.0 or later.
|
||||
- `master`: Projects created before GitLab 14.0.
|
||||
1. If no custom default branch name is set at any level, GitLab defaults to `main`.
|
||||
|
||||
In the GitLab UI, you can change the defaults at any level. GitLab also provides
|
||||
the [Git commands you need](#update-the-default-branch-name-in-your-repository) to update your copy of the repository.
|
||||
|
|
@ -69,9 +67,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/221013) in GitLab 13.2 [with a flag](../../../../administration/feature_flags.md) named `global_default_branch_name`. Enabled by default.
|
||||
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/325163) in GitLab 13.12. Feature flag `global_default_branch_name` removed.
|
||||
|
||||
GitLab [administrators](../../../permissions.md) of self-managed instances can
|
||||
customize the initial branch for projects hosted on that instance. Individual
|
||||
groups and subgroups can override this instance-wide setting for their projects.
|
||||
|
|
@ -88,8 +83,6 @@ overrides it.
|
|||
|
||||
### Group-level custom initial branch name
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/221014) in GitLab 13.6.
|
||||
|
||||
Users with the Owner role of groups and subgroups can configure the default branch name for a group:
|
||||
|
||||
1. On the left sidebar, select **Search or go to** and find your group.
|
||||
|
|
@ -157,8 +150,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/211944) in GitLab 13.0.
|
||||
|
||||
Instance-level protections for default branches
|
||||
can be overridden on a per-group basis by the group's owner. In
|
||||
[GitLab Premium or Ultimate](https://about.gitlab.com/pricing/), GitLab administrators can
|
||||
|
|
@ -179,9 +170,6 @@ DETAILS:
|
|||
**Tier:** Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7583) in GitLab 12.9.
|
||||
> - [Settings moved and renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/340403) in GitLab 14.9.
|
||||
|
||||
Instance-level protections for the default branch
|
||||
can be overridden on a per-group basis by the group's owner. In
|
||||
[GitLab Premium or Ultimate](https://about.gitlab.com/pricing/), GitLab administrators can
|
||||
|
|
@ -261,8 +249,6 @@ renames a Git repository's (`example`) default branch.
|
|||
|
||||
## Default branch rename redirect
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/329100) in GitLab 14.1
|
||||
|
||||
URLs for specific files or directories in a project embed the project's default
|
||||
branch name, and are often found in documentation or browser bookmarks. When you
|
||||
[update the default branch name in your repository](#update-the-default-branch-name-in-your-repository),
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ DETAILS:
|
|||
**Tier:** Free, Premium, Ultimate
|
||||
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/14174) in GitLab 14.1.
|
||||
|
||||
A comma-separated values (CSV) file is a delimited text file that uses a comma to separate values.
|
||||
Each line of the file is a data record. Each record consists of one or more fields, separated by
|
||||
commas. The use of the comma as a field separator is the source of the name for this file format.
|
||||
|
|
|
|||
|
|
@ -27,8 +27,6 @@ can access the object pool connected to the source project.
|
|||
|
||||
## Create a fork
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15013) a new form in GitLab 13.11 [with a flag](../../../user/feature_flags.md) named `fork_project_form`. Disabled by default.
|
||||
> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77181) in GitLab 14.8. Feature flag `fork_project_form` removed.
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/24894) in GitLab 16.6.
|
||||
|
||||
To fork an existing project in GitLab:
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue