kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2021-02-09 18:09:59 +00:00
parent 6c5f3e7b4e
commit 16cfd85bcf
117 changed files with 711 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/packages_and_registries/settings/group/bundle.js
View file

@ -1,10 +1,13 @@
import Vue from 'vue';
import { GlToast } from '@gitlab/ui';
import Translate from '~/vue_shared/translate';
import { parseBoolean } from '~/lib/utils/common_utils';
import SettingsApp from './components/group_settings_app.vue';
import { apolloProvider } from './graphql';
Vue.use(Translate);
Vue.use(GlToast);
export default () => {
const el = document.getElementById('js-packages-and-registries-settings');

19
app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue
View file

@ -1,6 +1,5 @@
<script>
import { GlSprintf, GlLink } from '@gitlab/ui';
import createFlash from '~/flash';
import { GlSprintf, GlLink, GlAlert } from '@gitlab/ui';
import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue';
import MavenSettings from '~/packages_and_registries/settings/group/components/maven_settings.vue';
@ -26,6 +25,7 @@ export default {
PACKAGES_DOCS_PATH,
},
components: {
GlAlert,
GlSprintf,
GlLink,
SettingsBlock,
@ -49,6 +49,7 @@ export default {
return {
packageSettings: {},
errors: {},
alertMessage: null,
};
},
computed: {
@ -57,6 +58,9 @@ export default {
},
},
methods: {
dismissAlert() {
this.alertMessage = null;
},
updateSettings(payload) {
this.errors = {};
return this.$apollo
@ -76,9 +80,10 @@ export default {
})
.then(({ data }) => {
if (data.updateNamespacePackageSettings?.errors?.length > 0) {
createFlash({ message: ERROR_UPDATING_SETTINGS, type: 'warning' });
this.alertMessage = ERROR_UPDATING_SETTINGS;
} else {
createFlash({ message: SUCCESS_UPDATING_SETTINGS, type: 'success' });
this.dismissAlert();
this.$toast.show(SUCCESS_UPDATING_SETTINGS, { type: 'success' });
}
})
.catch((e) => {
@ -93,7 +98,7 @@ export default {
this.errors = { ...this.errors, [key]: message };
});
}
createFlash({ message: ERROR_UPDATING_SETTINGS, type: 'warning' });
this.alertMessage = ERROR_UPDATING_SETTINGS;
});
},
},
@ -102,6 +107,10 @@ export default {
<template>
<div>
<gl-alert v-if="alertMessage" variant="warning" class="gl-mt-4" @dismiss="dismissAlert">
{{ alertMessage }}
</gl-alert>
<settings-block :default-expanded="defaultExpanded">
<template #title> {{ $options.i18n.PACKAGE_SETTINGS_HEADER }}</template>
<template #description>

9
app/finders/container_repositories_finder.rb
View file

@ -14,7 +14,8 @@ class ContainerRepositoriesFinder
return unless authorized?
repositories = @subject.is_a?(Project) ? project_repositories : group_repositories
filter_by_image_name(repositories)
repositories = filter_by_image_name(repositories)
sort(repositories)
end
private
@ -39,6 +40,12 @@ class ContainerRepositoriesFinder
repositories.search_by_name(@params[:name])
end
def sort(repositories)
return repositories unless @params[:sort]
repositories.order_by(@params[:sort])
end
def authorized?
Ability.allowed?(@user, :read_container_image, @subject)
end

9
app/graphql/resolvers/container_repositories_resolver.rb
View file

@ -10,8 +10,13 @@ module Resolvers
required: false,
description: 'Filter the container repositories by their name.'
def resolve(name: nil)
ContainerRepositoriesFinder.new(user: current_user, subject: object, params: { name: name })
argument :sort, Types::ContainerRepositorySortEnum,
description: 'Sort container repositories by this criteria.',
required: false,
default_value: :created_desc
def resolve(name: nil, sort: nil)
ContainerRepositoriesFinder.new(user: current_user, subject: object, params: { name: name, sort: sort })
.execute
.tap { track_event(:list_repositories, :container) }
end

11
app/graphql/types/container_repository_sort_enum.rb Normal file
View file

@ -0,0 +1,11 @@
# frozen_string_literal: true
module Types
class ContainerRepositorySortEnum < SortEnum
graphql_name 'ContainerRepositorySort'
description 'Values for sorting container repositories'
value 'NAME_ASC', 'Name by ascending order', value: :name_asc
value 'NAME_DESC', 'Name by descending order', value: :name_desc
end
end

1
app/models/container_repository.rb
View file

@ -4,6 +4,7 @@ class ContainerRepository < ApplicationRecord
include Gitlab::Utils::StrongMemoize
include Gitlab::SQL::Pattern
include EachBatch
include Sortable
WAITING_CLEANUP_STATUSES = %i[cleanup_scheduled cleanup_unfinished].freeze

2
app/models/note.rb
View file

@ -542,7 +542,7 @@ class Note < ApplicationRecord
end
def skip_notification?
review.present?
review.present? || author.ghost?
end
private

3
app/models/pages/lookup_path.rb
View file

@ -5,7 +5,6 @@ module Pages
include Gitlab::Utils::StrongMemoize
LegacyStorageDisabledError = Class.new(::StandardError)
MIGRATED_FILE_NAME = "_migrated.zip"
def initialize(project, trim_prefix: nil, domain: nil)
@project = project
@ -55,7 +54,7 @@ module Pages
return if deployment.file.file_storage? && !Feature.enabled?(:pages_serve_with_zip_file_protocol, project)
return if deployment.file.filename == MIGRATED_FILE_NAME && !Feature.enabled?(:pages_serve_from_migrated_zip, project)
return if deployment.migrated? && !Feature.enabled?(:pages_serve_from_migrated_zip, project)
global_id = ::Gitlab::GlobalId.build(deployment, id: deployment.id).to_s

7
app/models/pages_deployment.rb
View file

@ -4,12 +4,15 @@
class PagesDeployment < ApplicationRecord
include FileStoreMounter
MIGRATED_FILE_NAME = "_migrated.zip"
attribute :file_store, :integer, default: -> { ::Pages::DeploymentUploader.default_store }
belongs_to :project, optional: false
belongs_to :ci_build, class_name: 'Ci::Build', optional: true
scope :older_than, -> (id) { where('id < ?', id) }
scope :migrated_from_legacy_storage, -> { where(file: MIGRATED_FILE_NAME) }
validates :file, presence: true
validates :file_store, presence: true, inclusion: { in: ObjectStorage::SUPPORTED_STORES }
@ -25,6 +28,10 @@ class PagesDeployment < ApplicationRecord
# this is to be adressed in https://gitlab.com/groups/gitlab-org/-/epics/589
end
def migrated?
file.filename == MIGRATED_FILE_NAME
end
private
def set_size

2
app/views/projects/issues/import_csv/_button.html.haml
View file

@ -2,7 +2,7 @@
- can_edit = can?(current_user, :admin_project, @project)
.dropdown.btn-group
%button.btn.gl-button.rounded-right.text-center{ class: ('has-tooltip' if type == :icon), title: (_('Import issues') if type == :icon),
%button.btn.gl-button.btn-default.rounded-right.text-center{ class: ('has-tooltip' if type == :icon), title: (_('Import issues') if type == :icon),
data: { toggle: 'dropdown', qa_selector: 'import_issues_button' }, 'aria-label' => _('Import issues'), 'aria-haspopup' => 'true', 'aria-expanded' => 'false' }
- if type == :icon
= sprite_icon('import')

2
app/views/shared/empty_states/_issues.html.haml
View file

@ -42,7 +42,7 @@
- if project_select_button
= render 'shared/new_project_item_select', path: 'issues/new', label: _('New issue'), type: :issues, with_feature_enabled: 'issues'
- else
= link_to _('New issue'), button_path, class: 'btn btn-success', id: 'new_issue_link'
= link_to _('New issue'), button_path, class: 'btn gl-button btn-success', id: 'new_issue_link'
- if show_import_button
= render 'projects/issues/import_csv/button', type: :text

2
app/workers/new_note_worker.rb
View file

@ -13,7 +13,7 @@ class NewNoteWorker # rubocop:disable Scalability/IdempotentWorker
# rubocop: disable CodeReuse/ActiveRecord
def perform(note_id, _params = {})
if note = Note.find_by(id: note_id)
NotificationService.new.new_note(note) unless note.skip_notification? || note.author.ghost?
NotificationService.new.new_note(note) unless note.skip_notification?
Notes::PostProcessService.new(note).execute
else
Gitlab::AppLogger.error("NewNoteWorker: couldn't find note with ID=#{note_id}, skipping job")

5
changelogs/unreleased/290302-sort-container-repositories.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Add sort argument to container_repositories graphql resolver
merge_request: 53404
author:
type: changed

5
changelogs/unreleased/gl-button-empty-issue-placeholder.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Apply new GitLab UI for buttons in empty issue placeholder
merge_request: 53554
author: Yogi (@yo)
type: other

5
changelogs/unreleased/track-5-mins-prod-app-usage.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Track 5 mins production app template usage
merge_request: 53618
author:
type: other

2
doc/administration/file_hooks.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference
---
# File hooks
# File hooks **(FREE)**
> - Introduced in GitLab 10.6.
> - Until GitLab 12.8, the feature name was Plugins.

2
doc/administration/git_protocol.md
View file

@ -6,7 +6,7 @@ type: reference
description: "Set and configure Git protocol v2"
---
# Configuring Git Protocol v2
# Configuring Git Protocol v2 **(FREE)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/46555) in GitLab 11.4.
> - [Temporarily disabled](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/55769) in GitLab 11.5.8, 11.6.6, 11.7.1, and 11.8+.

2
doc/administration/integration/plantuml.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# PlantUML & GitLab
# PlantUML & GitLab **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8537) in GitLab 8.16.

2
doc/administration/invalidate_markdown_cache.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference
---
# Invalidate Markdown Cache
# Invalidate Markdown Cache **(FREE)**
For performance reasons, GitLab caches the HTML version of Markdown text
in fields like comments, issue descriptions, and merge request descriptions. These

2
doc/api/branches.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Branches API
# Branches API **(FREE)**
This API operates on [repository branches](../user/project/repository/branches/index.md).

2
doc/api/commits.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Commits API
# Commits API **(FREE)**
## List repository commits

2
doc/api/discussions.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, api
---
# Discussions API
# Discussions API **(FREE)**
Discussions are a set of related notes on:

65
doc/api/graphql/reference/gitlab_schema.graphql
View file

@ -4427,6 +4427,61 @@ Identifier of ContainerRepository.
"""
scalar ContainerRepositoryID
"""
Values for sorting container repositories
"""
enum ContainerRepositorySort {
"""
Created at ascending order
"""
CREATED_ASC
"""
Created at descending order
"""
CREATED_DESC
"""
Name by ascending order
"""
NAME_ASC
"""
Name by descending order
"""
NAME_DESC
"""
Updated at ascending order
"""
UPDATED_ASC
"""
Updated at descending order
"""
UPDATED_DESC
"""
Created at ascending order
"""
created_asc @deprecated(reason: "Use CREATED_ASC. Deprecated in 13.5.")
"""
Created at descending order
"""
created_desc @deprecated(reason: "Use CREATED_DESC. Deprecated in 13.5.")
"""
Updated at ascending order
"""
updated_asc @deprecated(reason: "Use UPDATED_ASC. Deprecated in 13.5.")
"""
Updated at descending order
"""
updated_desc @deprecated(reason: "Use UPDATED_DESC. Deprecated in 13.5.")
}
"""
Status of a container repository
"""
@ -10650,6 +10705,11 @@ type Group {
Filter the container repositories by their name.
"""
name: String
"""
Sort container repositories by this criteria.
"""
sort: ContainerRepositorySort = created_desc
): ContainerRepositoryConnection
"""
@ -18690,6 +18750,11 @@ type Project {
Filter the container repositories by their name.
"""
name: String
"""
Sort container repositories by this criteria.
"""
sort: ContainerRepositorySort = created_desc
): ContainerRepositoryConnection
"""

91
doc/api/graphql/reference/gitlab_schema.json
View file

@ -12061,6 +12061,77 @@
"enumValues": null,
"possibleTypes": null
},
{
"kind": "ENUM",
"name": "ContainerRepositorySort",
"description": "Values for sorting container repositories",
"fields": null,
"inputFields": null,
"interfaces": null,
"enumValues": [
{
"name": "updated_desc",
"description": "Updated at descending order",
"isDeprecated": true,
"deprecationReason": "Use UPDATED_DESC. Deprecated in 13.5."
},
{
"name": "updated_asc",
"description": "Updated at ascending order",
"isDeprecated": true,
"deprecationReason": "Use UPDATED_ASC. Deprecated in 13.5."
},
{
"name": "created_desc",
"description": "Created at descending order",
"isDeprecated": true,
"deprecationReason": "Use CREATED_DESC. Deprecated in 13.5."
},
{
"name": "created_asc",
"description": "Created at ascending order",
"isDeprecated": true,
"deprecationReason": "Use CREATED_ASC. Deprecated in 13.5."
},
{
"name": "UPDATED_DESC",
"description": "Updated at descending order",
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "UPDATED_ASC",
"description": "Updated at ascending order",
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "CREATED_DESC",
"description": "Created at descending order",
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "CREATED_ASC",
"description": "Created at ascending order",
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "NAME_ASC",
"description": "Name by ascending order",
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "NAME_DESC",
"description": "Name by descending order",
"isDeprecated": false,
"deprecationReason": null
}
],
"possibleTypes": null
},
{
"kind": "ENUM",
"name": "ContainerRepositoryStatus",
@ -29330,6 +29401,16 @@
},
"defaultValue": null
},
{
"name": "sort",
"description": "Sort container repositories by this criteria.",
"type": {
"kind": "ENUM",
"name": "ContainerRepositorySort",
"ofType": null
},
"defaultValue": "created_desc"
},
{
"name": "after",
"description": "Returns the elements in the list that come after the specified cursor.",
@ -54963,6 +55044,16 @@
},
"defaultValue": null
},
{
"name": "sort",
"description": "Sort container repositories by this criteria.",
"type": {
"kind": "ENUM",
"name": "ContainerRepositorySort",
"ofType": null
},
"defaultValue": "created_desc"
},
{
"name": "after",
"description": "Returns the elements in the list that come after the specified cursor.",

17
doc/api/graphql/reference/index.md
View file

@ -4698,6 +4698,23 @@ Status of the tags cleanup of a container repository.
| `UNFINISHED` | The tags cleanup has been partially executed. There are still remaining tags to delete. |
| `UNSCHEDULED` | The tags cleanup is not scheduled. This is the default state. |
### ContainerRepositorySort
Values for sorting container repositories.
| Value | Description |
| ----- | ----------- |
| `CREATED_ASC` | Created at ascending order |
| `CREATED_DESC` | Created at descending order |
| `NAME_ASC` | Name by ascending order |
| `NAME_DESC` | Name by descending order |
| `UPDATED_ASC` | Updated at ascending order |
| `UPDATED_DESC` | Updated at descending order |
| `created_asc` **{warning-solid}** | **Deprecated:** Use CREATED_ASC. Deprecated in 13.5. |
| `created_desc` **{warning-solid}** | **Deprecated:** Use CREATED_DESC. Deprecated in 13.5. |
| `updated_asc` **{warning-solid}** | **Deprecated:** Use UPDATED_ASC. Deprecated in 13.5. |
| `updated_desc` **{warning-solid}** | **Deprecated:** Use UPDATED_DESC. Deprecated in 13.5. |
### ContainerRepositoryStatus
Status of a container repository.

2
doc/api/keys.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Keys API
# Keys API **(FREE)**
## Get SSH key with user by ID of an SSH key

2
doc/api/markdown.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Markdown API
# Markdown API **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18926) in GitLab 11.0.

2
doc/api/merge_request_context_commits.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Merge request context commits API
# Merge request context commits API **(FREE)**
## List MR context commits

2
doc/api/merge_requests.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Merge requests API
# Merge requests API **(FREE)**
> - `author_id`, `author_username`, and `assignee_id` were [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13060) in GitLab 9.5.
> - `my_reaction_emoji` was [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14016) in GitLab 10.0.

2
doc/api/project_badges.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Project badges API
# Project badges API **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17082) in GitLab 10.6.

2
doc/api/project_import_export.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Project import/export API
# Project import/export API **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41899) in GitLab 10.6.

2
doc/api/project_statistics.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Project statistics API
# Project statistics API **(FREE)**
Every API call to [project](../user/project/index.md) statistics must be authenticated.

2
doc/api/project_templates.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Project templates API
# Project templates API **(FREE)**
This API is a project-specific version of these endpoints:

2
doc/api/protected_branches.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Protected branches API
# Protected branches API **(FREE)**
> Introduced in GitLab 9.5.

2
doc/api/protected_tags.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Protected tags API
# Protected tags API **(FREE)**
> Introduced in GitLab 11.3.

2
doc/api/remote_mirrors.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Project remote mirrors API
# Project remote mirrors API **(FREE)**
[Push mirrors](../user/project/repository/repository_mirroring.md#pushing-to-a-remote-repository)
defined on a project's repository settings are called "remote mirrors", and the

2
doc/api/repository_files.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Repository files API
# Repository files API **(FREE)**
**CRUD for repository files**

2
doc/api/repository_submodules.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Repository submodules API
# Repository submodules API **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41213) in GitLab 11.5

2
doc/api/search.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Search API
# Search API **(FREE)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41763) in GitLab 10.5.
> - [Feature flag `search_filter_by_confidential` removed](https://gitlab.com/gitlab-org/gitlab/-/issues/244923) in GitLab 13.6.

2
doc/api/suggestions.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Suggest Changes API
# Suggest Changes API **(FREE)**
Every API call to suggestions must be authenticated.

2
doc/api/tags.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Tags API
# Tags API **(FREE)**
## List project repository tags

2
doc/development/approval_rules.md
View file

@ -4,7 +4,7 @@ group: Source Code
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
---
# Approval Rules development guide
# Approval Rules development guide **(FREE)**
This document explains the backend design and flow of all related functionality
about [merge request approval rules](../user/project/merge_requests/merge_request_approvals.md).

2
doc/development/code_intelligence/index.md
View file

@ -4,7 +4,7 @@ group: Source Code
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
---
# Code Intelligence
# Code Intelligence **(FREE)**
> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/1576) in GitLab 13.1.

2
doc/development/documentation/index.md
View file

@ -207,7 +207,7 @@ To add a redirect:
1. Assign the MR to a technical writer for review and merge.
1. If the redirect is to one of the 4 internal docs projects (not an external URL),
create an MR in [`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs):
1. Update [`redirects.yaml`](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/master/content/_data/redirects.yaml)
1. Update [`content/_data/redirects.yaml`](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/master/content/_data/redirects.yaml)
with one redirect entry for each renamed or moved file. This code works for
<https://docs.gitlab.com> links only. Keep them alphabetically sorted:

2
doc/development/internal_api.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, api
---
# Internal API
# Internal API **(FREE)**
The internal API is used by different GitLab components, it can not be
used by other consumers. This documentation is intended for people

2
doc/development/lfs.md
View file

@ -4,7 +4,7 @@ group: Source Code
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
---
# Git LFS
# Git LFS **(FREE)**
## Deep Dive

2
doc/development/new_fe_guide/modules/widget_extensions.md
View file

@ -4,7 +4,7 @@ group: Source Code
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
---
# Merge request widget extensions
# Merge request widget extensions **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44616) in GitLab 13.6.

2
doc/gitlab-basics/README.md
View file

@ -6,7 +6,7 @@ comments: false
type: index
---
# GitLab basics guides
# GitLab basics guides **(FREE)**
This section provides resources to help you start working with GitLab and Git by focusing
on the basic features that you will need to use.

2
doc/gitlab-basics/add-file.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: howto
---
# Add a file to a repository
# Add a file to a repository **(FREE)**
Adding files to a repository is a small, but key task. Bringing files in to a repository,
such as code, images, or documents, allows them to be tracked by Git, even though they

2
doc/gitlab-basics/command-line-commands.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: howto, reference
---
# Edit files through the command line
# Edit files through the command line **(FREE)**
When [working with Git from the command line](start-using-git.md), you need to
use more than just the Git commands. There are several basic commands that you should

2
doc/gitlab-basics/create-branch.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: howto
---
# How to create a branch
# How to create a branch **(FREE)**
A branch is an independent line of development in a [project](../user/project/index.md).

2
doc/gitlab-basics/feature_branch_workflow.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
disqus_identifier: 'https://docs.gitlab.com/ee/workflow/workflow.html'
---
# Feature branch workflow
# Feature branch workflow **(FREE)**
1. Clone project:

2
doc/gitlab-basics/start-using-git.md
View file

@ -6,7 +6,7 @@ type: howto, tutorial
description: "Introduction to using Git through the command line."
---
# Start using Git on the command line
# Start using Git on the command line **(FREE)**
[Git](https://git-scm.com/) is an open-source distributed version control system designed to
handle everything from small to very large projects with speed and efficiency. GitLab is built

2
doc/integration/sourcegraph.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, how-to
---
# Sourcegraph integration
# Sourcegraph integration **(FREE)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556) in GitLab 12.5.
> - Note that this integration is in BETA and deployed [behind a feature flag](#enable-the-sourcegraph-feature-flag) disabled by default. Self-managed instances can opt to enable it.

2
doc/intro/README.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
comments: false
---
# Get started with GitLab
# Get started with GitLab **(FREE)**
## Organize

2
doc/topics/git/feature_branch_development.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: how-tos
---
# Develop on a feature branch
# Develop on a feature branch **(FREE)**
GitLab values encourage the use of [Minimal Viable Change (MVC)](https://about.gitlab.com/handbook/values/#minimal-viable-change-mvc).
However, viable changes are not always small. In such cases, it can help to set up a dedicated feature branch.

2
doc/topics/git/git_rebase.md
View file

@ -6,7 +6,7 @@ type: concepts, howto
description: "Introduction to Git rebase, force-push, and resolving merge conflicts through the command line."
---
# Introduction to Git rebase, force-push, and merge conflicts
# Introduction to Git rebase, force-push, and merge conflicts **(FREE)**
This guide helps you to get started with rebasing, force-pushing, and fixing
merge conflicts locally.

2
doc/topics/git/how_to_install_git/index.md
View file

@ -6,7 +6,7 @@ description: 'This article describes how to install Git on macOS, Ubuntu Linux a
type: howto
---
# Installing Git
# Installing Git **(FREE)**
To begin contributing to GitLab projects,
you will need to install the Git client on your computer.

2
doc/topics/git/index.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: index
---
# Git
# Git **(FREE)**
Git is a [free and open source](https://git-scm.com/about/free-and-open-source)
distributed version control system designed to handle everything from small to

2
doc/topics/git/lfs/index.md
View file

@ -6,7 +6,7 @@ type: reference, howto
disqus_identifier: 'https://docs.gitlab.com/ee/workflow/lfs/lfs/index.html'
---
# Git Large File Storage (LFS)
# Git Large File Storage (LFS) **(FREE)**
Managing large files such as audio, video and graphics files has always been one
of the shortcomings of Git. The general recommendation is to not have Git repositories

2
doc/topics/git/lfs/migrate_from_git_annex_to_git_lfs.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# Migration guide from Git Annex to Git LFS
# Migration guide from Git Annex to Git LFS **(FREE)**
WARNING:
Git Annex support [has been removed](https://gitlab.com/gitlab-org/gitlab/-/issues/1648) in GitLab Enterprise

2
doc/topics/git/numerous_undo_possibilities_in_git/index.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: howto
---
# Numerous undo possibilities in Git
# Numerous undo possibilities in Git **(FREE)**
This tutorial shows you different ways of undoing your work in Git.
We assume you have a basic working knowledge of Git. Check the GitLab

2
doc/topics/git/partial_clone.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# Partial Clone
# Partial Clone **(FREE)**
As Git repositories grow in size, they can become cumbersome to work with
because of the large amount of history that must be downloaded, and the large

2
doc/topics/git/troubleshooting_git.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: howto
---
# Troubleshooting Git
# Troubleshooting Git **(FREE)**
Sometimes things don't work the way they should or as you might expect when
you're using Git. Here are some tips on troubleshooting and resolving issues

2
doc/topics/git/useful_git_commands.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference
---
# Useful Git commands
# Useful Git commands **(FREE)**
The GitLab support team has collected these commands to help you. You may not
need to use them often.

2
doc/topics/gitlab_flow.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
disqus_identifier: 'https://docs.gitlab.com/ee/workflow/gitlab_flow.html'
---
# Introduction to GitLab Flow
# Introduction to GitLab Flow **(FREE)**
![GitLab Flow](img/gitlab_flow.png)

2
doc/user/admin_area/settings/instance_template_repository.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference
---
# Instance template repository **(PREMIUM SELF)**
# Instance template repository **(PREMIUM SELF)** **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5986) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.3.

2
doc/user/admin_area/settings/push_event_activities_limit.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference
---
# Push event activities limit and bulk push events
# Push event activities limit and bulk push events **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31007) in GitLab 12.4.

2
doc/user/asciidoc.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# AsciiDoc
# AsciiDoc **(FREE)**
GitLab uses the [Asciidoctor](https://asciidoctor.org) gem to convert AsciiDoc content to HTML5.
Consult the [Asciidoctor User Manual](https://asciidoctor.org/docs/user-manual/) for a complete Asciidoctor reference.

4
doc/user/discussions/index.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# Threads
# Threads **(FREE)**
The ability to contribute conversationally is offered throughout GitLab.
@ -408,7 +408,7 @@ the merge request authored by the user that applied them.
1. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/25381) in GitLab 13.9,
you can opt to add a custom commit message to describe your change. If you don't
specify it, the default commit message will be used. Note that [this feature may not be available to you](#enable-or-disable-custom-commit-messages-for-suggestions).
specify it, the default commit message will be used. Note that [this feature may not be available to you](#enable-or-disable-custom-commit-messages-for-suggestions).
Also, it is not supported for [batch suggestions](#batch-suggestions).
![Custom commit](img/custom_commit_v13_9.png)

2
doc/user/markdown.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# GitLab Markdown
# GitLab Markdown **(FREE)**
This Markdown guide is **valid only for the GitLab internal Markdown rendering system for entries and files**.
It is **not** valid for the [GitLab documentation website](https://docs.gitlab.com)

2
doc/user/profile/account/create_accounts.md
View file

@ -37,3 +37,5 @@ Users will be:
- Automatically created upon first sign in with the [LDAP integration](../../../administration/auth/ldap/index.md).
- Created when first signing in via an [OmniAuth provider](../../../integration/omniauth.md) if the `allow_single_sign_on` setting is present.
- Created when first signing with [Group SAML](../../group/saml_sso/index.md)
- Automatically created by [SCIM](../../group/saml_sso/scim_setup.md) when the user is created in the identity provider.

2
doc/user/project/autocomplete_characters.md
View file

@ -6,7 +6,7 @@ type: reference
description: "Autocomplete chars in Markdown fields."
---
# Autocomplete characters
# Autocomplete characters **(FREE)**
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

2
doc/user/project/badges.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# Badges
# Badges **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41174) in GitLab 10.7.

2
doc/user/project/code_intelligence.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference
---
# Code Intelligence
# Code Intelligence **(FREE)**
> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/1576) in GitLab 13.1.

2
doc/user/project/git_attributes.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference
---
# Git Attributes
# Git Attributes **(FREE)**
GitLab supports defining custom [Git attributes](https://git-scm.com/docs/gitattributes) such as what
files to treat as binary, and what language to use for syntax highlighting

2
doc/user/project/highlighting.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference
---
# Syntax Highlighting
# Syntax Highlighting **(FREE)**
GitLab provides syntax highlighting on all files through the [Rouge](https://rubygems.org/gems/rouge) Ruby gem. It attempts to guess what language to use based on the file extension, which most of the time is sufficient.

2
doc/user/project/index.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference
---
# Projects
# Projects **(FREE)**
In GitLab, you can create projects for hosting
your codebase, use it as an issue tracker, collaborate on code, and continuously

2
doc/user/project/merge_requests/allow_collaboration.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, howto
---
# Allow collaboration on merge requests across forks
# Allow collaboration on merge requests across forks **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17395) in GitLab 10.6.

2
doc/user/project/merge_requests/authorization_for_merge_requests.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: concepts
---
# Authorization for Merge requests
# Authorization for Merge requests **(FREE)**
There are two main ways to have a merge request flow with GitLab:

2
doc/user/project/merge_requests/cherry_pick_changes.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, concepts
---
# Cherry-pick changes
# Cherry-pick changes **(FREE)**
GitLab implements Git's powerful feature to
[cherry-pick any commit](https://git-scm.com/docs/git-cherry-pick "Git cherry-pick documentation")

2
doc/user/project/merge_requests/creating_merge_requests.md
View file

@ -7,7 +7,7 @@ description: "How to create Merge Requests in GitLab."
disqus_identifier: 'https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html'
---
# How to create a merge request
# How to create a merge request **(FREE)**
Before creating a merge request, read through an
[introduction to Merge Requests](getting_started.md)

2
doc/user/project/merge_requests/fast_forward_merge.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, concepts
---
# Fast-forward merge requests
# Fast-forward merge requests **(FREE)**
Sometimes, a workflow policy might mandate a clean commit history without
merge commits. In such cases, the fast-forward merge is the perfect candidate.

2
doc/user/project/merge_requests/getting_started.md
View file

@ -6,7 +6,7 @@ type: index, reference
description: "Getting started with Merge Requests."
---
# Getting started with Merge Requests
# Getting started with Merge Requests **(FREE)**
A Merge Request (**MR**) is the basis of GitLab as a code
collaboration and version control.

2
doc/user/project/merge_requests/index.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: index, reference
---
# Merge requests
# Merge requests **(FREE)**
A Merge Request (**MR**) is a _request_ to _merge_ one branch into another.

2
doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, concepts
---
# Merge when pipeline succeeds
# Merge when pipeline succeeds **(FREE)**
When reviewing a merge request that looks ready to merge but still has a
pipeline running, you can set it to merge automatically when the

2
doc/user/project/merge_requests/resolve_conflicts.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, concepts
---
# Merge request conflict resolution
# Merge request conflict resolution **(FREE)**
Merge conflicts occur when two branches have different changes that cannot be
merged automatically.

2
doc/user/project/merge_requests/revert_changes.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, concepts
---
# Reverting changes
# Reverting changes **(FREE)**
You can use Git's powerful feature to [revert any commit](https://git-scm.com/docs/git-revert "Git revert documentation")
by clicking the **Revert** button in merge requests and commit details.

2
doc/user/project/merge_requests/squash_and_merge.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, concepts
---
# Squash and merge
# Squash and merge **(FREE)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1024) in [GitLab Starter](https://about.gitlab.com/pricing/) 8.17.
> - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18956) from [GitLab Starter](https://about.gitlab.com/pricing/)to GitLab Free in 11.0.

2
doc/user/project/protected_branches.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# Protected branches
# Protected branches **(FREE)**
[Permissions](../permissions.md) in GitLab are fundamentally defined around the
idea of having read or write permission to the repository and branches. To impose

2
doc/user/project/protected_tags.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# Protected tags
# Protected tags **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10356) in GitLab 9.1.

2
doc/user/project/push_options.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, howto
---
# Push Options
# Push Options **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/15643) in GitLab 11.7.

2
doc/user/project/repository/branches/index.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: concepts, howto
---
# Branches
# Branches **(FREE)**
A branch is a version of a project's working tree. You create a branch for each
set of related changes you make. This keeps each set of changes separate from

2
doc/user/project/repository/forking_workflow.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
disqus_identifier: 'https://docs.gitlab.com/ee/workflow/forking_workflow.html'
---
# Project forking workflow
# Project forking workflow **(FREE)**
Whenever possible, it's recommended to work in a common Git repository and use
[branching strategies](../../../topics/gitlab_flow.md) to manage your work. However,

2
doc/user/project/repository/git_blame.md
View file

@ -6,7 +6,7 @@ type: reference, howto
description: "Documentation on Git file blame."
---
# Git file blame
# Git file blame **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/commit/39c657930625ddc3ac8a921f01ffc83acadce68f) in GitLab 2.5.

2
doc/user/project/repository/git_history.md
View file

@ -6,7 +6,7 @@ type: reference, howto
description: "Documentation on Git file history."
---
# Git file history
# Git file history **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/blob/9ba1224867665844b117fa037e1465bb706b3685/app/controllers/commits_controller.rb) in GitLab 0.8.0

2
doc/user/project/repository/gpg_signed_commits/index.md
View file

@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: concepts, howto
---
# Signing commits with GPG
# Signing commits with GPG **(FREE)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9546) in GitLab 9.5.
> - Subkeys support was added in GitLab 10.1.

2
doc/user/project/repository/index.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: concepts, howto
---
# Repository
# Repository **(FREE)**
A [repository](https://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository)
is what you use to store your codebase in GitLab and change it with version control.

2
doc/user/project/repository/jupyter_notebooks/index.md
View file

@ -4,7 +4,7 @@ group: Source Code
info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments"
type: reference
---
# Jupyter Notebook Files
# Jupyter Notebook Files **(FREE)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/2508/) in GitLab 9.1.

2
doc/user/project/repository/repository_mirroring.md
View file

@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
disqus_identifier: 'https://docs.gitlab.com/ee/workflow/repository_mirroring.html'
---
# Repository mirroring
# Repository mirroring **(FREE)**
Repository mirroring allows for mirroring of repositories to and from external sources. It can be
used to mirror branches, tags, and commits between repositories. It is useful when you want to use

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