Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
d7d3c0922d
commit
e2dcb7987a
11 changed files with 59 additions and 15 deletions
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Remove build dependencies on code quality and license scanning
|
||||
merge_request: 34659
|
||||
author:
|
||||
type: other
|
||||
|
|
@ -213,6 +213,26 @@ For information on configuring Geo, see [Geo configuration](configuration.md).
|
|||
|
||||
For information on how to update your Geo nodes to the latest GitLab version, see [Updating the Geo nodes](updating_the_geo_nodes.md).
|
||||
|
||||
### Pausing and resuming replication
|
||||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/35913) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.2.
|
||||
|
||||
In some circumstances, like during [upgrades](updating_the_geo_nodes.md) or a [planned failover](../disaster_recovery/planned_failover.md), it is desirable to pause replication between the primary and secondary.
|
||||
|
||||
Pausing and resuming replication is done via a command line tool from the secondary node.
|
||||
|
||||
**To Pause: (from secondary)**
|
||||
|
||||
```shell
|
||||
gitlab-ctl geo-replication-pause
|
||||
```
|
||||
|
||||
**To Resume: (from secondary)**
|
||||
|
||||
```shell
|
||||
gitlab-ctl geo-replication-resume
|
||||
```
|
||||
|
||||
### Configuring Geo for multiple servers
|
||||
|
||||
For information on configuring Geo for multiple servers, see [Geo for multiple servers](multiple_servers.md).
|
||||
|
|
|
|||
|
|
@ -41,10 +41,12 @@ NOTE: **Note:** These general update steps are not intended for [high-availabili
|
|||
To update the Geo nodes when a new GitLab version is released, update **primary**
|
||||
and all **secondary** nodes:
|
||||
|
||||
1. **Optional:** [Pause replication on each **secondary** node.](./index.md#pausing-and-resuming-replication)
|
||||
1. Log into the **primary** node.
|
||||
1. [Update GitLab on the **primary** node using Omnibus](https://docs.gitlab.com/omnibus/update/README.html).
|
||||
1. Log into each **secondary** node.
|
||||
1. [Update GitLab on each **secondary** node using Omnibus](https://docs.gitlab.com/omnibus/update/README.html).
|
||||
1. If you paused replication in step 1, [resume replication on each **secondary**](./index.md#pausing-and-resuming-replication)
|
||||
1. [Test](#check-status-after-updating) **primary** and **secondary** nodes, and check version in each.
|
||||
|
||||
### Check status after updating
|
||||
|
|
|
|||
|
|
@ -513,8 +513,6 @@ appear to be associated to any of the services running, since they all appear to
|
|||
| `projects_unify_circuit_active` | `counts` | | | | |
|
||||
| `projects_webex_teams_active` | `counts` | | | | |
|
||||
| `projects_youtrack_active` | `counts` | | | | |
|
||||
| `projects_slack_notifications_active` | `counts` | | | | |
|
||||
| `projects_slack_slash_active` | `counts` | | | | |
|
||||
| `projects_jira_server_active` | `counts` | | | | |
|
||||
| `projects_jira_cloud_active` | `counts` | | | | |
|
||||
| `projects_jira_dvcs_cloud_active` | `counts` | | | | |
|
||||
|
|
|
|||
|
|
@ -192,6 +192,12 @@ possible.
|
|||
|
||||
## Version specific upgrading instructions
|
||||
|
||||
### 13.2.0
|
||||
|
||||
GitLab installations that have multiple web nodes will need to be
|
||||
[upgraded to 13.1](#1310) before upgrading to 13.2 (and later) due to a
|
||||
breaking change in Rails that can result in authorization issues.
|
||||
|
||||
### 13.1.0
|
||||
|
||||
In 13.1.0, you must upgrade to either:
|
||||
|
|
@ -202,6 +208,27 @@ In 13.1.0, you must upgrade to either:
|
|||
Failure to do so will result in internal errors in the Gitaly service in some RPCs due
|
||||
to the use of the new `--end-of-options` Git flag.
|
||||
|
||||
Additionally, in GitLab 13.1.0, the version of [Rails was upgraded from 6.0.3 to
|
||||
6.0.3.1](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33454).
|
||||
The Rails upgrade included a change to CSRF token generation which is
|
||||
not backwards-compatible - GitLab servers with the new Rails version
|
||||
will generate CSRF tokens that are not recognizable by GitLab servers
|
||||
with the older Rails version - which could cause non-GET requests to
|
||||
fail for [multi-node GitLab installations](https://docs.gitlab.com/omnibus/update/#multi-node--ha-deployment).
|
||||
|
||||
So, if you are using multiple Rails servers and specifically upgrading from 13.0,
|
||||
all servers must first be upgraded to 13.1.0 before upgrading to later versions:
|
||||
|
||||
1. Ensure all GitLab web nodes are on GitLab 13.1.0.
|
||||
1. Optionally, enable the `global_csrf_token` feature flag to enable new
|
||||
method of CSRF token generation:
|
||||
|
||||
```ruby
|
||||
Feature.enable(:global_csrf_token)
|
||||
```
|
||||
|
||||
1. Only then, continue to upgrade to later versions of GitLab.
|
||||
|
||||
### 12.2.0
|
||||
|
||||
In 12.2.0, we enabled Rails' authenticated cookie encryption. Old sessions are
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ You can find it in the **Admin Area > Settings > CI/CD**.
|
|||
To enable (or disable) [Auto DevOps](../../../topics/autodevops/index.md)
|
||||
for all projects:
|
||||
|
||||
1. Go to **Admin Area > Settings > CI/CD**
|
||||
1. Go to **Admin Area > Settings > CI/CD**.
|
||||
1. Check (or uncheck to disable) the box that says **Default to Auto DevOps pipeline for all projects**.
|
||||
1. Optionally, set up the [Auto DevOps base domain](../../../topics/autodevops/index.md#auto-devops-base-domain)
|
||||
which is going to be used for Auto Deploy and Auto Review Apps.
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ code_quality:
|
|||
DOCKER_DRIVER: overlay2
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/ci-cd/codequality:0.85.10"
|
||||
needs: []
|
||||
script:
|
||||
- |
|
||||
if ! docker info &>/dev/null; then
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ license_scanning:
|
|||
LM_REPORT_VERSION: '2.1'
|
||||
SETUP_CMD: $LICENSE_MANAGEMENT_SETUP_CMD
|
||||
allow_failure: true
|
||||
needs: []
|
||||
script:
|
||||
- /run.sh analyze .
|
||||
artifacts:
|
||||
|
|
|
|||
|
|
@ -347,15 +347,9 @@ module Gitlab
|
|||
|
||||
# rubocop: disable CodeReuse/ActiveRecord
|
||||
def services_usage
|
||||
results = Service.available_services_names.without('jira').each_with_object({}) do |service_name, response|
|
||||
Service.available_services_names.without('jira').each_with_object({}) do |service_name, response|
|
||||
response["projects_#{service_name}_active".to_sym] = count(Service.active.where(template: false, type: "#{service_name}_service".camelize))
|
||||
end
|
||||
|
||||
# Keep old Slack keys for backward compatibility, https://gitlab.com/gitlab-data/analytics/issues/3241
|
||||
results[:projects_slack_notifications_active] = results[:projects_slack_active]
|
||||
results[:projects_slack_slash_active] = results[:projects_slack_slash_commands_active]
|
||||
|
||||
results.merge(jira_usage).merge(jira_import_usage)
|
||||
end.merge(jira_usage).merge(jira_import_usage)
|
||||
end
|
||||
|
||||
def jira_usage
|
||||
|
|
|
|||
|
|
@ -126,8 +126,6 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
|
|||
expect(count_data[:jira_imports_projects_count]).to eq(2)
|
||||
expect(count_data[:jira_imports_total_imported_count]).to eq(3)
|
||||
expect(count_data[:jira_imports_total_imported_issues_count]).to eq(13)
|
||||
expect(count_data[:projects_slack_notifications_active]).to eq(2)
|
||||
expect(count_data[:projects_slack_slash_active]).to eq(1)
|
||||
expect(count_data[:projects_slack_active]).to eq(2)
|
||||
expect(count_data[:projects_slack_slash_commands_active]).to eq(1)
|
||||
expect(count_data[:projects_custom_issue_tracker_active]).to eq(1)
|
||||
|
|
|
|||
|
|
@ -89,8 +89,6 @@ module UsageDataHelpers
|
|||
projects_jira_active
|
||||
projects_jira_server_active
|
||||
projects_jira_cloud_active
|
||||
projects_slack_notifications_active
|
||||
projects_slack_slash_active
|
||||
projects_slack_active
|
||||
projects_slack_slash_commands_active
|
||||
projects_custom_issue_tracker_active
|
||||
|
|
|
|||
Loading…
Reference in a new issue