diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 7271ddc86e0..8c08aa82118 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0e0aeb5ca4488903f41acd392911bd89d1ad3d6d +2ed3a40e02e3b5d284af33f14dbad2f5aff044d6 diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml index 6fc78003df4..b1412b4dc65 100644 --- a/app/views/projects/_new_project_fields.html.haml +++ b/app/views/projects/_new_project_fields.html.haml @@ -98,7 +98,7 @@ = check_box_tag 'project[initialize_with_sast]', '1', true, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' } = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do = s_('ProjectsNew|Enable Static Application Security Testing (SAST)') - %span.badge.badge-info.badge-pill.gl-badge.sm= _('Free') + = gl_badge_tag _('Free'), variant: :info, size: :sm .form-text.text-muted = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.') = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name } @@ -108,7 +108,7 @@ = check_box_tag 'project[initialize_with_sast]', '1', false, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' } = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do = s_('ProjectsNew|Enable Static Application Security Testing (SAST)') - %span.badge.badge-info.badge-pill.gl-badge.sm= _('Free') + = gl_badge_tag _('Free'), variant: :info, size: :sm .form-text.text-muted = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.') = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name } diff --git a/data/deprecations/14-3-deprecation-release-cli.yml b/data/deprecations/14-3-deprecation-release-cli.yml index d04e97df380..63b948733f2 100644 --- a/data/deprecations/14-3-deprecation-release-cli.yml +++ b/data/deprecations/14-3-deprecation-release-cli.yml @@ -1,4 +1,4 @@ -- name: "Release CLI be distributed as a generic package" # The name of the feature to be deprecated +- name: "Release CLI distributed as a generic package" # The name of the feature to be deprecated announcement_milestone: "14.2" # The milestone when this feature was first announced as deprecated. announcement_date: "2021-08-22" # The date of the milestone release when this feature was first announced as deprecated removal_milestone: "14.6" # The milestone when this feature is planned to be removed diff --git a/doc/administration/incoming_email.md b/doc/administration/incoming_email.md index 3f54f5dd576..17173dc88d7 100644 --- a/doc/administration/incoming_email.md +++ b/doc/administration/incoming_email.md @@ -531,19 +531,20 @@ enabled by default, and must be enabled through PowerShell. This series of PowerShell commands enables [sub-addressing](#email-sub-addressing) at the organization level in Office 365. This allows all mailboxes in the organization -to receive sub-addressed mail: +to receive sub-addressed mail. -```powershell -Set-ExecutionPolicy RemoteSigned -Scope CurrentUser +To enable sub-addressing: -$UserCredential = Get-Credential +1. Download and install the `ExchangeOnlineManagement` module from the [PowerShell gallery](https://www.powershellgallery.com/packages/ExchangeOnlineManagement/). +1. In PowerShell, run the following commands: -$Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://outlook.office365.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection - -Import-PSSession $Session -DisableNameChecking - -Set-OrganizationConfig -AllowPlusAddressInRecipients $true -``` + ```powershell + Set-ExecutionPolicy RemoteSigned -Scope CurrentUser + Import-Module ExchangeOnlineManagement + Connect-ExchangeOnline + Set-OrganizationConfig -AllowPlusAddressInRecipients $true + Disconnect-ExchangeOnline + ``` This example for Omnibus GitLab assumes the mailbox `incoming@office365.example.com`: diff --git a/doc/install/docker.md b/doc/install/docker.md index 2efe6a3640b..4496e7a34d3 100644 --- a/doc/install/docker.md +++ b/doc/install/docker.md @@ -141,23 +141,25 @@ install, and upgrade your Docker-based GitLab installation: 1. Create a `docker-compose.yml` file (or [download an example](https://gitlab.com/gitlab-org/omnibus-gitlab/raw/master/docker/docker-compose.yml)): ```yaml - web: - image: 'gitlab/gitlab-ee:latest' - restart: always - hostname: 'gitlab.example.com' - environment: - GITLAB_OMNIBUS_CONFIG: | - external_url 'https://gitlab.example.com' - # Add any other gitlab.rb configuration here, each on its own line - ports: - - '80:80' - - '443:443' - - '22:22' - volumes: - - '$GITLAB_HOME/config:/etc/gitlab' - - '$GITLAB_HOME/logs:/var/log/gitlab' - - '$GITLAB_HOME/data:/var/opt/gitlab' - shm_size: '256m' + version: '3.6' + services: + web: + image: 'gitlab/gitlab-ee:latest' + restart: always + hostname: 'gitlab.example.com' + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'https://gitlab.example.com' + # Add any other gitlab.rb configuration here, each on its own line + ports: + - '80:80' + - '443:443' + - '22:22' + volumes: + - '$GITLAB_HOME/config:/etc/gitlab' + - '$GITLAB_HOME/logs:/var/log/gitlab' + - '$GITLAB_HOME/data:/var/opt/gitlab' + shm_size: '256m' ``` 1. Make sure you are in the same directory as `docker-compose.yml` and start @@ -176,22 +178,24 @@ HTTP and SSH port. Notice how the `GITLAB_OMNIBUS_CONFIG` variables match the `ports` section: ```yaml -web: - image: 'gitlab/gitlab-ee:latest' - restart: always - hostname: 'gitlab.example.com' - environment: - GITLAB_OMNIBUS_CONFIG: | - external_url 'http://gitlab.example.com:8929' - gitlab_rails['gitlab_shell_ssh_port'] = 2224 - ports: - - '8929:8929' - - '2224:22' - volumes: - - '$GITLAB_HOME/config:/etc/gitlab' - - '$GITLAB_HOME/logs:/var/log/gitlab' - - '$GITLAB_HOME/data:/var/opt/gitlab' - shm_size: '256m' +version: '3.6' +services: + web: + image: 'gitlab/gitlab-ee:latest' + restart: always + hostname: 'gitlab.example.com' + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'http://gitlab.example.com:8929' + gitlab_rails['gitlab_shell_ssh_port'] = 2224 + ports: + - '8929:8929' + - '2224:22' + volumes: + - '$GITLAB_HOME/config:/etc/gitlab' + - '$GITLAB_HOME/logs:/var/log/gitlab' + - '$GITLAB_HOME/data:/var/opt/gitlab' + shm_size: '256m' ``` This is the same as using `--publish 8929:8929 --publish 2224:22`. diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index dd51d823109..ef2b3f7e7d6 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -385,3 +385,9 @@ then override the icon in one of two ways: ... } ``` + +## Limitations + +Most supported OmniAuth providers don't support Git over HTTP password authentication. +The only exception is [Atlassian Crowd](../administration/auth/crowd.md) (since GitLab [13.7](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46935)). +As a workaround, you can authenticate using a [personal access token](../user/profile/personal_access_tokens.md). diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md index 16b4ca474a9..872338a8c82 100644 --- a/doc/update/deprecations.md +++ b/doc/update/deprecations.md @@ -49,7 +49,7 @@ Planned removal: 2021-11-22 ## 14.6 -### Release CLI be distributed as a generic package +### Release CLI distributed as a generic package The [release-cli](https://gitlab.com/gitlab-org/release-cli) will be released as a [generic package](https://gitlab.com/gitlab-org/release-cli/-/packages) starting in GitLab 14.2. We will continue to deploy it as a binary to S3 until GitLab 14.5 and stop distributing it in S3 in GitLab 14.6.