Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/administration/job_logs.md8
-rw-r--r--doc/administration/object_storage.md2
-rw-r--r--doc/administration/reference_architectures/troubleshooting.md2
-rw-r--r--doc/user/project/repository/branches/default.md4
-rw-r--r--spec/features/projects/members/groups_with_access_list_spec.rb2
5 files changed, 8 insertions, 10 deletions
diff --git a/doc/administration/job_logs.md b/doc/administration/job_logs.md
index 1afadcaf668..568a9c78ca9 100644
--- a/doc/administration/job_logs.md
+++ b/doc/administration/job_logs.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference
---
-# Job logs
+# Job logs **(FREE SELF)**
> [Renamed from job traces to job logs](https://gitlab.com/gitlab-org/gitlab/-/issues/29121) in GitLab 12.5.
@@ -109,7 +109,7 @@ See "Phase 4: uploading" in [Data flow](#data-flow) to learn about the process.
If you want to avoid any local disk usage for job logs,
you can do so using one of the following options:
-- Enable the [beta incremental logging](#new-incremental-logging-architecture) feature.
+- Enable the [beta incremental logging](#incremental-logging-architecture) feature.
- Set the [job logs location](#changing-the-job-logs-local-location)
to an NFS drive.
@@ -128,9 +128,7 @@ This command permanently deletes the log files and is irreversible.
find /var/opt/gitlab/gitlab-rails/shared/artifacts -name "job.log" -mtime +60 -delete
```
-## New incremental logging architecture
-
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18169) in GitLab 10.4.
+## Incremental logging architecture
NOTE:
This beta feature is off by default. See below for how to [enable or disable](#enabling-incremental-logging) it.
diff --git a/doc/administration/object_storage.md b/doc/administration/object_storage.md
index cbef752773b..d133e8c3721 100644
--- a/doc/administration/object_storage.md
+++ b/doc/administration/object_storage.md
@@ -595,7 +595,7 @@ with the Fog library that GitLab uses. Symptoms include an error in `production.
If you configure GitLab to use object storage for CI logs and artifacts,
you can avoid [local disk usage for job logs](job_logs.md#data-flow) by enabling
-[beta incremental logging](job_logs.md#new-incremental-logging-architecture).
+[beta incremental logging](job_logs.md#incremental-logging-architecture).
### Proxy Download
diff --git a/doc/administration/reference_architectures/troubleshooting.md b/doc/administration/reference_architectures/troubleshooting.md
index 60a6ee0132f..e5d65264a5c 100644
--- a/doc/administration/reference_architectures/troubleshooting.md
+++ b/doc/administration/reference_architectures/troubleshooting.md
@@ -33,7 +33,7 @@ The dependency on disk storage also prevents Pages being deployed using the
### Incremental logging is required for CI to use object storage
If you configure GitLab to use object storage for CI logs and artifacts,
-[you must also enable incremental logging](../job_logs.md#new-incremental-logging-architecture).
+[you must also enable incremental logging](../job_logs.md#incremental-logging-architecture).
### Proxy Download
diff --git a/doc/user/project/repository/branches/default.md b/doc/user/project/repository/branches/default.md
index b6446cdc63f..deacf119d38 100644
--- a/doc/user/project/repository/branches/default.md
+++ b/doc/user/project/repository/branches/default.md
@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: concepts, howto
---
-# Default branch
+# Default branch **(FREE)**
When you create a new [project](../../index.md), GitLab creates a default branch
in the repository. A default branch has special configuration options not shared
@@ -74,7 +74,7 @@ Projects created on this instance after you change the setting use the
custom branch name, unless a group-level or subgroup-level configuration
overrides it.
-### Group-level custom initial branch name **(FREE)**
+### Group-level custom initial branch name
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/221014) in GitLab 13.6.
diff --git a/spec/features/projects/members/groups_with_access_list_spec.rb b/spec/features/projects/members/groups_with_access_list_spec.rb
index 6a1d26983b5..84a972b3027 100644
--- a/spec/features/projects/members/groups_with_access_list_spec.rb
+++ b/spec/features/projects/members/groups_with_access_list_spec.rb
@@ -78,7 +78,7 @@ RSpec.describe 'Projects > Members > Groups with access list', :js do
context 'search in existing members' do
it 'finds no results' do
- fill_in_filtered_search 'Search groups', with: 'testing 123'
+ fill_in_filtered_search 'Search groups', with: 'non_existing_group_name'
click_groups_tab