Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
a7e65e2a32
commit
a23e299d91
|
|
@ -188,7 +188,7 @@ class Member < ApplicationRecord
|
|||
end
|
||||
|
||||
after_commit on: [:destroy], unless: :importing? do
|
||||
refresh_member_authorized_projects(blocking: Feature.disabled?(:member_destroy_async_auth_refresh, type: :ops))
|
||||
refresh_member_authorized_projects(blocking: false)
|
||||
end
|
||||
|
||||
default_value_for :notification_level, NotificationSetting.levels[:global]
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
---
|
||||
name: member_destroy_async_auth_refresh
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66424
|
||||
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342120
|
||||
milestone: '14.4'
|
||||
type: ops
|
||||
group: group::access
|
||||
default_enabled: false
|
||||
|
|
@ -12,7 +12,7 @@ Follow these guidelines when contributing or reviewing design and user interface
|
|||
advice and best practices for code review in general.
|
||||
|
||||
The basis for most of these guidelines is [Pajamas](https://design.gitlab.com/),
|
||||
GitLab design system. We encourage you to [contribute to Pajamas](https://design.gitlab.com/get-started/contribute)
|
||||
GitLab design system. We encourage you to [contribute to Pajamas](https://design.gitlab.com/get-started/contribute/)
|
||||
with additions and improvements.
|
||||
|
||||
## Merge request reviews
|
||||
|
|
@ -32,9 +32,9 @@ Check these aspects both when _designing_ and _reviewing_ UI changes.
|
|||
- Follow [Pajamas](https://design.gitlab.com/content/punctuation/) as the primary
|
||||
guidelines for UI text and [documentation style guide](../documentation/styleguide/index.md)
|
||||
as the secondary.
|
||||
- Use clear and consistent [terminology](https://design.gitlab.com/content/terminology).
|
||||
- Use clear and consistent [terminology](https://design.gitlab.com/content/terminology/).
|
||||
- Check grammar and spelling.
|
||||
- Consider help content and follow its [guidelines](https://design.gitlab.com/usability/helping-users).
|
||||
- Consider help content and follow its [guidelines](https://design.gitlab.com/usability/helping-users/).
|
||||
- Request review from the [appropriate Technical Writer](https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers),
|
||||
indicating any specific files or lines they should review, and how to preview
|
||||
or understand the location/context of the text from the user's perspective.
|
||||
|
|
@ -43,20 +43,20 @@ Check these aspects both when _designing_ and _reviewing_ UI changes.
|
|||
|
||||
- Consider similar patterns used in the product and justify in the issue when diverging
|
||||
from them.
|
||||
- Use appropriate [components](https://design.gitlab.com/components/overview)
|
||||
and [data visualizations](https://design.gitlab.com/data-visualization/overview).
|
||||
- Use appropriate [components](https://design.gitlab.com/components/overview/)
|
||||
and [data visualizations](https://design.gitlab.com/data-visualization/overview/).
|
||||
|
||||
### Visual design
|
||||
|
||||
Check visual design properties using your browser's _elements inspector_ ([Chrome](https://developer.chrome.com/docs/devtools/css/),
|
||||
[Firefox](https://developer.mozilla.org/en-US/docs/Tools/Page_Inspector/How_to/Open_the_Inspector)).
|
||||
|
||||
- Use recommended [colors](https://design.gitlab.com/product-foundations/colors)
|
||||
and [typography](https://design.gitlab.com/product-foundations/type-fundamentals).
|
||||
- Follow [layout guidelines](https://design.gitlab.com/layout/grid).
|
||||
- Use existing [icons](http://gitlab-org.gitlab.io/gitlab-svgs/) and [illustrations](http://gitlab-org.gitlab.io/gitlab-svgs/illustrations)
|
||||
or propose new ones according to [iconography](https://design.gitlab.com/product-foundations/iconography)
|
||||
and [illustration](https://design.gitlab.com/product-foundations/illustration)
|
||||
- Use recommended [colors](https://design.gitlab.com/product-foundations/colors/)
|
||||
and [typography](https://design.gitlab.com/product-foundations/type-fundamentals/).
|
||||
- Follow [layout guidelines](https://design.gitlab.com/layout/grid/).
|
||||
- Use existing [icons](http://gitlab-org.gitlab.io/gitlab-svgs/) and [illustrations](http://gitlab-org.gitlab.io/gitlab-svgs/illustrations/)
|
||||
or propose new ones according to [iconography](https://design.gitlab.com/product-foundations/iconography/)
|
||||
and [illustration](https://design.gitlab.com/product-foundations/illustration/)
|
||||
guidelines.
|
||||
- _Optionally_ consider [dark mode](../../user/profile/preferences.md#dark-mode). [^1]
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ like `:hover` and others ([Chrome](https://developer.chrome.com/docs/devtools/cs
|
|||
- Account for states dependent on data size ([empty](https://design.gitlab.com/regions/empty-states),
|
||||
some data, and lots of data).
|
||||
- Account for states dependent on user role, user preferences, and subscription.
|
||||
- Consider animations and transitions, and follow their [guidelines](https://design.gitlab.com/product-foundations/motion).
|
||||
- Consider animations and transitions, and follow their [guidelines](https://design.gitlab.com/product-foundations/motion/).
|
||||
|
||||
### Responsive
|
||||
|
||||
|
|
@ -90,8 +90,8 @@ Check accessibility using your browser's _accessibility inspector_ ([Chrome](htt
|
|||
[Firefox](https://developer.mozilla.org/en-US/docs/Tools/Accessibility_inspector#accessing_the_accessibility_inspector)).
|
||||
|
||||
- Conform to level AA of the World Wide Web Consortium (W3C) [Web Content Accessibility Guidelines 2.1](https://www.w3.org/TR/WCAG21/),
|
||||
according to our [statement of compliance](https://design.gitlab.com/accessibility/a11y).
|
||||
- Follow accessibility [best practices](https://design.gitlab.com/accessibility/best-practices)
|
||||
according to our [statement of compliance](https://design.gitlab.com/accessibility/a11y/).
|
||||
- Follow accessibility [best practices](https://design.gitlab.com/accessibility/best-practices/)
|
||||
and [checklist](../fe_guide/accessibility.md#quick-checklist).
|
||||
|
||||
### Handoff
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Therefore, you should postpone this effort until the [experiment cleanup process
|
|||
|
||||
We recommend the following workflow:
|
||||
|
||||
1. Review the Pajamas guidelines for [icons](https://design.gitlab.com/product-foundations/iconography) and [illustrations](https://design.gitlab.com/product-foundations/illustration).
|
||||
1. Review the Pajamas guidelines for [icons](https://design.gitlab.com/product-foundations/iconography/) and [illustrations](https://design.gitlab.com/product-foundations/illustration/).
|
||||
1. Add an icon or illustration as an `.svg` file in the `/app/assets/images` (or EE) path in the GitLab repository.
|
||||
1. Use `image_tag` or `image_path` to render it via the asset pipeline.
|
||||
1. **If the experiment is a success**, designers add the new icon or illustration to the Pajamas UI kit as part of the cleanup process.
|
||||
|
|
|
|||
|
|
@ -334,7 +334,7 @@ Keep in mind that:
|
|||
- When you add `:hover` styles, in most cases you should add `:focus` styles too so that the styling is applied for both mouse **and** keyboard users.
|
||||
- If you remove an interactive element's `outline`, make sure you maintain visual focus state in another way such as with `box-shadow`.
|
||||
|
||||
See the [Pajamas Keyboard-only page](https://design.gitlab.com/accessibility-audits/keyboard-only) for more detail.
|
||||
See the [Pajamas Keyboard-only page](https://design.gitlab.com/accessibility-audits/keyboard-only/) for more detail.
|
||||
|
||||
## Tabindex
|
||||
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ The former Ruby-based indexer was removed in [GitLab 12.3](https://gitlab.com/gi
|
|||
First, we need to install some dependencies, then we build and install
|
||||
the indexer itself.
|
||||
|
||||
This project relies on [International Components for Unicode](http://site.icu-project.org/) (ICU) for text encoding,
|
||||
This project relies on [International Components for Unicode](https://icu.unicode.org/) (ICU) for text encoding,
|
||||
therefore we must ensure the development packages for your platform are
|
||||
installed before running `make`.
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ To use the GitLab Gitpod integration, it must be enabled for your GitLab instanc
|
|||
1. It's [enabled and configured by a GitLab administrator](#configure-a-self-managed-instance).
|
||||
1. It's [enabled in their user settings](#enable-gitpod-in-your-user-settings).
|
||||
|
||||
To learn more about Gitpod, see their [features](https://www.gitpod.io/features/) and
|
||||
To learn more about Gitpod, see their [features](https://www.gitpod.io/features) and
|
||||
[documentation](https://www.gitpod.io/docs/).
|
||||
|
||||
## Enable Gitpod in your user settings
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ To simplify administration, we recommend that a GitLab group maintainer or group
|
|||
|
||||
| Jira usage | GitLab.com customers need | GitLab self-managed customers need |
|
||||
|------------|---------------------------|------------------------------------|
|
||||
| [Atlassian cloud](https://www.atlassian.com/cloud) | The [GitLab.com for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) installed from the [Atlassian Marketplace](https://marketplace.atlassian.com). This offers real-time sync between GitLab.com and Jira. For more information, see the documentation for the [GitLab.com for Jira Cloud app](connect-app.md). | The [GitLab.com for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview), using a workaround process. See the documentation for [installing the GitLab.com for Jira Cloud app for self-managed instances](connect-app.md#install-the-gitlabcom-for-jira-cloud-app-for-self-managed-instances) for more information. |
|
||||
| [Atlassian cloud](https://www.atlassian.com/migration/assess/why-cloud) | The [GitLab.com for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) installed from the [Atlassian Marketplace](https://marketplace.atlassian.com). This offers real-time sync between GitLab.com and Jira. For more information, see the documentation for the [GitLab.com for Jira Cloud app](connect-app.md). | The [GitLab.com for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview), using a workaround process. See the documentation for [installing the GitLab.com for Jira Cloud app for self-managed instances](connect-app.md#install-the-gitlabcom-for-jira-cloud-app-for-self-managed-instances) for more information. |
|
||||
| Your own server | The [Jira DVCS (distributed version control system) connector](dvcs.md). This syncs data hourly. | The [Jira DVCS Connector](dvcs.md). |
|
||||
|
||||
Each GitLab project can be configured to connect to an entire Jira instance. That means after
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ in your GitLab project with any of your projects in Jira.
|
|||
### Jira integration
|
||||
|
||||
This integration connects one or more GitLab projects to a Jira instance. The Jira instance
|
||||
can be hosted by you or in [Atlassian cloud](https://www.atlassian.com/cloud).
|
||||
can be hosted by you or in [Atlassian cloud](https://www.atlassian.com/migration/assess/why-cloud).
|
||||
The supported Jira versions are `v6.x`, `v7.x`, and `v8.x`.
|
||||
|
||||
<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ of the page to activate it in the GitLab instance.
|
|||
|
||||
## System header and footer messages
|
||||
|
||||
> - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/55057) to GitLab Free in 11.9.
|
||||
> - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/55057) from GitLab Premium to GitLab Free in 11.9.
|
||||
|
||||
You can add a small header message, a small footer message, or both, to the interface
|
||||
of your GitLab instance. These messages appear on all projects and pages of the
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
|
|||
|
||||
# External authorization control **(FREE SELF)**
|
||||
|
||||
> - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27056) to GitLab Free in 11.10.
|
||||
> - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27056) from GitLab Premium to GitLab Free in 11.10.
|
||||
|
||||
In highly controlled environments, it may be necessary for access policy to be
|
||||
controlled by an external service that permits access based on project
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
|
|||
|
||||
# Federated Learning of Cohorts (FLoC) **(FREE SELF)**
|
||||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60933) in GitLab Free 13.12.
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60933) in GitLab 13.12.
|
||||
|
||||
Federated Learning of Cohorts (FLoC) is a new feature of the Chrome browser.
|
||||
It works by categorizing users into different cohorts, so that
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ try again.
|
|||
|
||||
## Configure using GitLab UI
|
||||
|
||||
> Introduced in [GitLab 12.4](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31246).
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31246) in GitLab 12.4.
|
||||
|
||||
Throttling of protected paths is enabled by default and can be disabled or
|
||||
customized on **Admin > Network > Protected Paths**, along with these options:
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ type: reference
|
|||
Redis. To avoid excessive memory for Redis, we:
|
||||
|
||||
- Compress job arguments before storing them in Redis.
|
||||
arguments before storing them in Redis, and rejecting jobs that exceed
|
||||
- Reject jobs that exceed the specified threshold limit after compression.
|
||||
|
||||
To access Sidekiq job size limits:
|
||||
|
|
@ -30,7 +29,6 @@ To access Sidekiq job size limits:
|
|||
|-------------------------------------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||
| Limiting mode | Compress | This mode compresses the jobs at the specified threshold and rejects them if they exceed the specified limit after compression. |
|
||||
| Sidekiq job compression threshold (bytes) | 100 000 (100 KB) | When the size of arguments exceeds this threshold, they are compressed before being stored in Redis. |
|
||||
| Sidekiq job size limit (bytes) | 0 | The jobs exceeding this size after compression are rejected. This avoids excessive memory usage in Redis leading to instability. Setting it to 0 prevents rejecting jobs. |
|
||||
| Sidekiq job size limit (bytes) | 0 | The jobs exceeding this size after compression are rejected. This avoids excessive memory usage in Redis leading to instability. Setting it to 0 prevents rejecting jobs. |
|
||||
|
||||
After changing these values, [restart
|
||||
Sidekiq](../../../administration/restart_gitlab.md).
|
||||
After changing these values, [restart Sidekiq](../../../administration/restart_gitlab.md).
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ To enforce confirmation of the email address used for new sign ups:
|
|||
1. On the left sidebar, select **Settings > General**, and expand **Sign-up restrictions**.
|
||||
1. Select the **Enable email restrictions for sign ups** checkbox, then select **Save changes**.
|
||||
|
||||
## User cap **(FREE SELF)**
|
||||
## User cap
|
||||
|
||||
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/4315) in GitLab 13.7.
|
||||
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/292600) in GitLab 13.9.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ type: reference
|
|||
|
||||
# Third-party offers **(FREE SELF)**
|
||||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/20379) in GitLab Free 11.1.
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/20379) in GitLab 11.1.
|
||||
|
||||
Within GitLab, we inform users of available third-party offers they might find valuable in order
|
||||
to enhance the development of their projects. An example is the Google Cloud Platform free credit
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ to perform various actions.
|
|||
|
||||
All usage statistics are [opt-out](#enable-or-disable-usage-statistics).
|
||||
|
||||
## Service Ping **(FREE SELF)**
|
||||
## Service Ping
|
||||
|
||||
Service Ping is a process that collects and sends a weekly payload to GitLab Inc.
|
||||
For more information, see the [Service Ping guide](../../../development/service_ping/index.md).
|
||||
|
|
@ -23,7 +23,7 @@ When Service Ping is enabled, GitLab gathers data from other instances and
|
|||
enables certain [instance-level analytics features](../analytics/index.md)
|
||||
that are dependent on Service Ping.
|
||||
|
||||
## Version check **(FREE SELF)**
|
||||
## Version check
|
||||
|
||||
If enabled, version check informs you if a new version is available and the
|
||||
importance of it through a status. The status displays on the help pages (`/help`)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ group: unassigned
|
|||
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
|
||||
---
|
||||
|
||||
# Cohorts **(FREE)**
|
||||
# Cohorts **(FREE SELF)**
|
||||
|
||||
You can analyze your users' GitLab activities over time.
|
||||
|
||||
|
|
|
|||
|
|
@ -244,32 +244,17 @@ RSpec.describe ProjectMember do
|
|||
project.add_user(user, Gitlab::Access::GUEST)
|
||||
end
|
||||
|
||||
context 'when :member_destroy_async_auth_refresh feature flag is enabled' do
|
||||
it 'changes access level', :sidekiq_inline do
|
||||
expect { action }.to change { user.can?(:guest_access, project) }.from(true).to(false)
|
||||
end
|
||||
|
||||
it 'calls AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker to recalculate authorizations' do
|
||||
expect(AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker).to receive(:perform_async).with(project.id, user.id)
|
||||
|
||||
action
|
||||
end
|
||||
|
||||
it_behaves_like 'calls AuthorizedProjectUpdate::UserRefreshFromReplicaWorker with a delay to update project authorizations'
|
||||
it 'changes access level', :sidekiq_inline do
|
||||
expect { action }.to change { user.can?(:guest_access, project) }.from(true).to(false)
|
||||
end
|
||||
|
||||
context 'when :member_destroy_async_auth_refresh feature flag is disabled' do
|
||||
before do
|
||||
stub_feature_flags(member_destroy_async_auth_refresh: false)
|
||||
end
|
||||
it 'calls AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker to recalculate authorizations' do
|
||||
expect(AuthorizedProjectUpdate::ProjectRecalculatePerUserWorker).to receive(:perform_async).with(project.id, user.id)
|
||||
|
||||
it 'changes access level' do
|
||||
expect { action }.to change { user.can?(:guest_access, project) }.from(true).to(false)
|
||||
end
|
||||
|
||||
it_behaves_like 'calls AuthorizedProjectUpdate::ProjectRecalculatePerUserService to recalculate authorizations'
|
||||
it_behaves_like 'calls AuthorizedProjectUpdate::UserRefreshFromReplicaWorker with a delay to update project authorizations'
|
||||
action
|
||||
end
|
||||
|
||||
it_behaves_like 'calls AuthorizedProjectUpdate::UserRefreshFromReplicaWorker with a delay to update project authorizations'
|
||||
end
|
||||
|
||||
context 'when the feature flag `specialized_service_for_project_member_auth_refresh` is disabled' do
|
||||
|
|
|
|||
Loading…
Reference in New Issue