Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
GitLab Bot
parent
f3352dd3f1
commit
e2dc98865b
23 changed files with 204 additions and 109 deletions
|
|
@ -1 +1 @@
|
|||
8d14377ab5b3914033f85ec3572e0ba65749a6e0
|
||||
2f16d97afa2e8accb4144f04e2e1e90bf4d1e9fb
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class AuthenticationEvent < ApplicationRecord
|
||||
include UsageStatistics
|
||||
|
||||
belongs_to :user, optional: true
|
||||
|
||||
validates :provider, :user_name, :result, presence: true
|
||||
|
|
@ -9,4 +11,11 @@ class AuthenticationEvent < ApplicationRecord
|
|||
failed: 0,
|
||||
success: 1
|
||||
}
|
||||
|
||||
scope :for_provider, ->(provider) { where(provider: provider) }
|
||||
scope :ldap, -> { where('provider LIKE ?', 'ldap%')}
|
||||
|
||||
def self.providers
|
||||
distinct.pluck(:provider)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Report auth events in manage stage usage ping
|
||||
merge_request: 39747
|
||||
author:
|
||||
type: added
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class AddResultIndexToAuthenticationEvents < ActiveRecord::Migration[6.0]
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
DOWNTIME = false
|
||||
INDEX_NAME = 'index_authentication_events_on_provider_user_id_created_at'
|
||||
|
||||
disable_ddl_transaction!
|
||||
|
||||
def up
|
||||
add_concurrent_index :authentication_events, [:provider, :user_id, :created_at], where: 'result = 1', name: INDEX_NAME
|
||||
end
|
||||
|
||||
def down
|
||||
remove_concurrent_index_by_name :authentication_events, INDEX_NAME
|
||||
end
|
||||
end
|
||||
1
db/schema_migrations/20200916151442
Normal file
1
db/schema_migrations/20200916151442
Normal file
|
|
@ -0,0 +1 @@
|
|||
aef52404e6ce83d5d4b3de65ad00b665334f5ff2e5b7b6c3c622f79313657f26
|
||||
|
|
@ -19478,6 +19478,8 @@ CREATE UNIQUE INDEX index_atlassian_identities_on_extern_uid ON atlassian_identi
|
|||
|
||||
CREATE INDEX index_authentication_events_on_provider ON authentication_events USING btree (provider);
|
||||
|
||||
CREATE INDEX index_authentication_events_on_provider_user_id_created_at ON authentication_events USING btree (provider, user_id, created_at) WHERE (result = 1);
|
||||
|
||||
CREATE INDEX index_authentication_events_on_user_id ON authentication_events USING btree (user_id);
|
||||
|
||||
CREATE INDEX index_award_emoji_on_awardable_type_and_awardable_id ON award_emoji USING btree (awardable_type, awardable_id);
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ The following documentation relates to the DevOps **Plan** stage:
|
|||
| [Milestones](user/project/milestones/index.md) | Set milestones for delivery of issues and merge requests, with optional due date. |
|
||||
| [Project Issue Board](user/project/issue_board.md) | Display issues on a Scrum or Kanban board. |
|
||||
| [Quick Actions](user/project/quick_actions.md) | Shortcuts for common actions on issues or merge requests, replacing the need to click buttons or use dropdowns in GitLab's UI. |
|
||||
| [Related Issues](user/project/issues/related_issues.md) **(STARTER)** | Create a relationship between issues. |
|
||||
| [Related Issues](user/project/issues/related_issues.md) | Create a relationship between issues. |
|
||||
| [Requirements Management](user/project/requirements/index.md) **(ULTIMATE)** | Check your products against a set of criteria. |
|
||||
| [Roadmap](user/group/roadmap/index.md) **(ULTIMATE)** | Visualize epic timelines. |
|
||||
| [Service Desk](user/project/service_desk.md) | A simple way to allow people to create issues in your GitLab instance without needing their own user account. |
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
# Issue links API **(STARTER)**
|
||||
# Issue links API **(CORE)**
|
||||
|
||||
> The simple "relates to" relationship [moved](https://gitlab.com/gitlab-org/gitlab/-/issues/212329) to [GitLab Core](https://about.gitlab.com/pricing/) in 13.4.
|
||||
|
||||
## List issue relations
|
||||
|
||||
Get a list of related issues of a given issue, sorted by the relationship creation datetime (ascending).
|
||||
Get a list of a given issue's [related issues](../user/project/issues/related_issues.md),
|
||||
sorted by the relationship creation datetime (ascending).
|
||||
Issues will be filtered according to the user authorizations.
|
||||
|
||||
```plaintext
|
||||
|
|
|
|||
|
|
@ -441,9 +441,9 @@ On your GitLab project repository navigate to the **Registry** tab.
|
|||
|
||||
|
||||
|
||||
You may need to [enable Container Registry](../../../user/packages/container_registry/index.md#enable-the-container-registry-for-your-project) to your project to see this tab. You'll find it under your project's **Settings > General > Visibility, project features, permissions**.
|
||||
You may need to enable the Container Registry for your project to see this tab. You'll find it under your project's **Settings > General > Visibility, project features, permissions**.
|
||||
|
||||
To start using Container Registry on our machine, we first need to login to the GitLab registry using our GitLab username and password:
|
||||
To start using Container Registry on our machine, we first need to sign in to the GitLab registry using our GitLab username and password:
|
||||
|
||||
```shell
|
||||
docker login registry.gitlab.com
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 45 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 51 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB |
|
|
@ -16,100 +16,44 @@ info: To determine the technical writer assigned to the Stage/Group associated w
|
|||
> - The group level Container Registry was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23315) in GitLab 12.10.
|
||||
> - Searching by image repository name was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31322) in GitLab 13.0.
|
||||
|
||||
NOTE: **Note:**
|
||||
This document is the user guide. To learn how to enable GitLab Container
|
||||
Registry across your GitLab instance, visit the
|
||||
[administrator documentation](../../../administration/packages/container_registry.md).
|
||||
|
||||
With the Docker Container Registry integrated into GitLab, every project can
|
||||
With the Docker Container Registry integrated into GitLab, every GitLab project can
|
||||
have its own space to store its Docker images.
|
||||
|
||||
You can read more about Docker Registry at <https://docs.docker.com/registry/introduction/>.
|
||||
|
||||
|
||||
NOTE: **Note:**
|
||||
This document is the user guide. To learn how to enable the Container
|
||||
Registry for your GitLab instance, visit the
|
||||
[administrator documentation](../../../administration/packages/container_registry.md).
|
||||
|
||||
## Enable the Container Registry for your project
|
||||
## View the Container Registry
|
||||
|
||||
You can view the Container Registry for a project or group.
|
||||
|
||||
1. Go to your project or group.
|
||||
1. Go to **Packages & Registries > Container Registry**.
|
||||
|
||||
You can search, sort, filter, and [delete](#delete-images-from-within-gitlab) containers on this page.
|
||||
|
||||
CAUTION: **Warning:**
|
||||
The Container Registry follows the visibility settings of the project. If the project is public, so is the Container Registry.
|
||||
If a project is public, so is the Container Registry.
|
||||
|
||||
If you cannot find the **Packages & Registries > Container Registry** entry under your
|
||||
project's sidebar, it is not enabled in your GitLab instance. Ask your
|
||||
administrator to enable GitLab Container Registry following the
|
||||
[administration documentation](../../../administration/packages/container_registry.md).
|
||||
## Use images from the Container Registry
|
||||
|
||||
If you are using GitLab.com, this is enabled by default so you can start using
|
||||
the Registry immediately. Currently there is a soft (10GB) size restriction for
|
||||
Registry on GitLab.com, as part of the [repository size limit](../../project/repository/index.md).
|
||||
To download and run a container image hosted in the GitLab Container Registry:
|
||||
|
||||
Once enabled for your GitLab instance, to enable Container Registry for your
|
||||
project:
|
||||
1. Copy the link to your container image:
|
||||
- Go to your project or group's **Packages & Registries > Container Registry**
|
||||
and find the image you want.
|
||||
- Next to the image name, click the **Copy** button.
|
||||
|
||||
1. Go to your project's **Settings > General** page.
|
||||
1. Expand the **Visibility, project features, permissions** section
|
||||
and enable the **Container Registry** feature on your project. For new
|
||||
projects this might be enabled by default. For existing projects
|
||||
(prior GitLab 8.8), enable it explicitly.
|
||||
1. Press **Save changes** for the changes to take effect. You should now be able
|
||||
to see the **Packages & Registries > Container Registry** link in the sidebar.
|
||||
|
||||
|
||||
## Control Container Registry from within GitLab
|
||||
1. Use `docker run` with the image link:
|
||||
|
||||
GitLab offers a simple Container Registry management panel. This management panel is available
|
||||
for both projects and groups.
|
||||
|
||||
### Control Container Registry for your project
|
||||
|
||||
Navigate to your project's **{package}** **Packages & Registries > Container Registry**.
|
||||
|
||||
|
||||
|
||||
This view allows you to:
|
||||
|
||||
- Show all the image repositories that belong to the project.
|
||||
- Filter image repositories by their name.
|
||||
- [Delete](#delete-images-from-within-gitlab) one or more image repository.
|
||||
- Navigate to the image repository details page.
|
||||
- Show a **Quick start** dropdown with the most common commands to log in, build and push.
|
||||
- Show a banner if the optional [cleanup policy](#cleanup-policy) is enabled for this project.
|
||||
|
||||
### Control Container Registry for your group
|
||||
|
||||
Navigate to your group's **{package}** **Packages & Registries > Container Registry**.
|
||||
|
||||
|
||||
|
||||
This view allows you to:
|
||||
|
||||
- Show all the image repositories of the projects that belong to this group.
|
||||
- [Delete](#delete-images-from-within-gitlab) one or more image repositories.
|
||||
- Navigate to a specific image repository details page.
|
||||
|
||||
### Image Repository details page
|
||||
|
||||
Clicking on the name of any image repository navigates to the details.
|
||||
|
||||
|
||||
|
||||
NOTE: **Note:**
|
||||
The following page has the same functionalities both in the **Group level container registry**
|
||||
and in the **Project level container registry**.
|
||||
|
||||
This view:
|
||||
|
||||
- Shows all the image repository details.
|
||||
- Shows all the tags of the image repository.
|
||||
- Allows you to quickly copy the tag path (by clicking on the clipboard button near the tag name).
|
||||
- Allows you to [delete one or more tags](#delete-images-from-within-gitlab).
|
||||
|
||||
## Use images from GitLab Container Registry
|
||||
|
||||
To download and run a container from images hosted in GitLab Container Registry,
|
||||
use `docker run`:
|
||||
|
||||
```shell
|
||||
docker run [options] registry.example.com/group/project/image [arguments]
|
||||
```
|
||||
```shell
|
||||
docker run [options] registry.example.com/group/project/image [arguments]
|
||||
```
|
||||
|
||||
For more information on running Docker containers, visit the
|
||||
[Docker documentation](https://docs.docker.com/engine/userguide/intro/).
|
||||
|
|
@ -118,10 +62,10 @@ For more information on running Docker containers, visit the
|
|||
|
||||
If you visit the **Packages & Registries > Container Registry** link under your project's
|
||||
menu, you can see the explicit instructions to login to the Container Registry
|
||||
using your GitLab credentials.
|
||||
by using your GitLab credentials.
|
||||
|
||||
For example if the Registry's URL is `registry.example.com`, then you should be
|
||||
able to login with:
|
||||
able to log in with:
|
||||
|
||||
```shell
|
||||
docker login registry.example.com
|
||||
|
|
@ -175,6 +119,10 @@ registry.example.com/group/project/image:latest
|
|||
registry.example.com/group/project/my/image:rc1
|
||||
```
|
||||
|
||||
NOTE: **Note:**
|
||||
Currently there is a soft (10GB) size restriction for
|
||||
the Container Registry on GitLab.com, as part of the [repository size limit](../../project/repository/index.md).
|
||||
|
||||
## Build and push images using GitLab CI/CD
|
||||
|
||||
While you can build and push your images from your local machine, take
|
||||
|
|
@ -406,8 +354,6 @@ To delete images from within GitLab:
|
|||
|
||||
1. In the dialog box, click **Remove tag**.
|
||||
|
||||
|
||||
|
||||
### Delete images using the API
|
||||
|
||||
If you want to automate the process of deleting images, GitLab provides an API. For more
|
||||
|
|
@ -652,6 +598,19 @@ Container Registry, you must delete all existing images.
|
|||
- Prior to GitLab 12.10, any tags that use the same image ID as the `latest` tag
|
||||
are not deleted by the cleanup policy.
|
||||
|
||||
## Disable the Container Registry for a project
|
||||
|
||||
The Container Registry is enabled by default.
|
||||
|
||||
You can, however, remove the Container Registry for a project:
|
||||
|
||||
1. Go to your project's **Settings > General** page.
|
||||
1. Expand the **Visibility, project features, permissions** section
|
||||
and disable **Container Registry**.
|
||||
1. Click **Save changes**.
|
||||
|
||||
The **Packages & Registries > Container Registry** entry is removed from the project's sidebar.
|
||||
|
||||
## Troubleshooting the GitLab Container Registry
|
||||
|
||||
### Docker connection error
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ The following table depicts the various user permission levels in a project.
|
|||
| Set issue weight | | ✓ | ✓ | ✓ | ✓ |
|
||||
| Lock issue threads | | ✓ | ✓ | ✓ | ✓ |
|
||||
| Manage issue tracker | | ✓ | ✓ | ✓ | ✓ |
|
||||
| Manage related issues **(STARTER)** | | ✓ | ✓ | ✓ | ✓ |
|
||||
| Manage related issues | | ✓ | ✓ | ✓ | ✓ |
|
||||
| Manage labels | | ✓ | ✓ | ✓ | ✓ |
|
||||
| Create code snippets | | ✓ | ✓ | ✓ | ✓ |
|
||||
| See a commit status | | ✓ | ✓ | ✓ | ✓ |
|
||||
|
|
@ -284,7 +284,7 @@ group.
|
|||
- The [instance level](admin_area/settings/visibility_and_access_controls.md#default-project-creation-protection).
|
||||
- The [group level](group/index.md#default-project-creation-level).
|
||||
1. Does not apply to subgroups.
|
||||
1. Developers can push commits to the default branch of a new project only if the [default branch protection](group/index.md#changing-the-default-branch-protection-of-a-group) is set to "Partially protected" or "Not protected".
|
||||
1. Developers can push commits to the default branch of a new project only if the [default branch protection](group/index.md#changing-the-default-branch-protection-of-a-group) is set to "Partially protected" or "Not protected".
|
||||
|
||||
### Subgroup permissions
|
||||
|
||||
|
|
|
|||
|
|
@ -156,12 +156,15 @@ collaborate with your team.
|
|||
efficiently and with less effort by tracking groups of issues that share a theme, across
|
||||
projects and milestones.
|
||||
|
||||
### Related issues **(STARTER)**
|
||||
### Related issues
|
||||
|
||||
You can mark two issues as related, so that when viewing one, the other is always
|
||||
listed in its [Related Issues](related_issues.md) section. This can help display important
|
||||
context, such as past work, dependencies, or duplicates.
|
||||
|
||||
Users on [GitLab Starter, GitLab Bronze, and higher tiers](https://about.gitlab.com/pricing/), can
|
||||
also mark issues as blocking or blocked by another issue.
|
||||
|
||||
### Crosslinking issues
|
||||
|
||||
You can [cross-link issues](crosslinking_issues.md) by referencing an issue from another
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ You can find all the information for that issue on one screen.
|
|||
- **15.** [Edit](#edit)
|
||||
- **16.** [Description](#description)
|
||||
- **17.** [Mentions](#mentions)
|
||||
- **18.** [Related Issues **(STARTER)**](#related-issues)
|
||||
- **18.** [Related Issues](#related-issues)
|
||||
- **19.** [Related Merge Requests](#related-merge-requests)
|
||||
- **20.** [Award emoji](#award-emoji)
|
||||
- **21.** [Show all activity](#show-all-activity)
|
||||
|
|
@ -208,7 +208,7 @@ TIP: **Tip:**
|
|||
Avoid mentioning `@all` in issues and merge requests, as it sends an email notification
|
||||
to all the members of that project's group, which can be interpreted as spam.
|
||||
|
||||
### Related Issues **(STARTER)**
|
||||
### Related Issues
|
||||
|
||||
Issues that were mentioned as [related issues](related_issues.md) are listed here.
|
||||
You can also click the `+` to add more related issues.
|
||||
|
|
|
|||
|
|
@ -4,33 +4,40 @@ group: Project Management
|
|||
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/#designated-technical-writers
|
||||
---
|
||||
|
||||
# Related issues **(STARTER)**
|
||||
# Related issues **(CORE)**
|
||||
|
||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1797) in [GitLab Starter](https://about.gitlab.com/pricing/) 9.4.
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1797) in [GitLab Starter](https://about.gitlab.com/pricing/) 9.4.
|
||||
> - The simple "relates to" relationship [moved](https://gitlab.com/gitlab-org/gitlab/-/issues/212329) to [GitLab Core](https://about.gitlab.com/pricing/) in 13.4.
|
||||
|
||||
Related issues are a bi-directional relationship between any two issues
|
||||
and appear in a block below the issue description. Issues can be across groups
|
||||
and projects.
|
||||
|
||||
You can set any issue as:
|
||||
|
||||
- Related to another issue
|
||||
- Blocking another issue **(STARTER)**
|
||||
- Blocked by another issue **(STARTER)**
|
||||
|
||||
The relationship only shows up in the UI if the user can see both issues.
|
||||
|
||||
When you try to close an issue that has open blockers, a warning is displayed.
|
||||
|
||||
TIP: **Tip:**
|
||||
To manage related issues through our API, see the [API documentation](../../../api/issue_links.md).
|
||||
To manage related issues through our API, visit the [issue links API documentation](../../../api/issue_links.md).
|
||||
|
||||
## Adding a related issue
|
||||
|
||||
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2035) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.8.
|
||||
> - [Improved](https://gitlab.com/gitlab-org/gitlab/-/issues/34239) to warn when attempting to close an issue that is blocked by others in [GitLab Starter](https://about.gitlab.com/pricing/) 13.0.
|
||||
> When you try to close an issue with open blockers, you'll see a warning that you can dismiss.
|
||||
> When you try to close an issue with open blockers, you see a warning that you can dismiss.
|
||||
|
||||
1. Relate one issue to another by clicking the related issues "+" button
|
||||
in the header of the related issue block.
|
||||
|
||||
1. Input the issue reference number or paste in the full URL of the issue.
|
||||
|
||||
1. Select whether the current issue relates to, blocks, or is blocked by the issues being entered.
|
||||
1. **(STARTER)** Select whether the current issue relates to, blocks, or is blocked by the issues being entered.
|
||||
|
||||
|
||||
|
||||
|
|
@ -42,11 +49,11 @@ in the header of the related issue block.
|
|||
- same group: `project#44`
|
||||
- different group: `group/project#44`
|
||||
|
||||
Valid references will be added to a temporary list that you can review.
|
||||
Valid references are added to a temporary list that you can review.
|
||||
|
||||
1. When you have added all the related issues, click **Add** to submit.
|
||||
|
||||
When you have finished adding all related issues, you will be able to see
|
||||
When you have finished adding all related issues, you can see
|
||||
them categorized so their relationships can be better understood visually.
|
||||
|
||||
|
||||
|
|
@ -56,7 +63,7 @@ them categorized so their relationships can be better understood visually.
|
|||
In the related issues block, click the "x" icon on the right-side of each issue
|
||||
token that you wish to remove.
|
||||
|
||||
Due to the bi-directional relationship, it will no longer appear in either issue.
|
||||
Due to the bi-directional relationship, it no longer appears in either issue.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -542,6 +542,7 @@ module Gitlab
|
|||
groups: distinct_count(::GroupMember.where(time_period), :user_id),
|
||||
users_created: count(::User.where(time_period), start: user_minimum_id, finish: user_maximum_id),
|
||||
omniauth_providers: filtered_omniauth_provider_names.reject { |name| name == 'group_saml' },
|
||||
user_auth_by_provider: distinct_count_user_auth_by_provider(time_period),
|
||||
projects_imported: {
|
||||
gitlab_project: projects_imported_count('gitlab_project', time_period),
|
||||
gitlab: projects_imported_count('gitlab', time_period),
|
||||
|
|
@ -813,6 +814,7 @@ module Gitlab
|
|||
clear_memoization(:approval_merge_request_rule_maximum_id)
|
||||
clear_memoization(:project_minimum_id)
|
||||
clear_memoization(:project_maximum_id)
|
||||
clear_memoization(:auth_providers)
|
||||
end
|
||||
|
||||
# rubocop: disable CodeReuse/ActiveRecord
|
||||
|
|
@ -844,6 +846,39 @@ module Gitlab
|
|||
def projects_imported_count(from, time_period)
|
||||
distinct_count(::Project.imported_from(from).where(time_period), :creator_id) # rubocop: disable CodeReuse/ActiveRecord
|
||||
end
|
||||
|
||||
# rubocop:disable CodeReuse/ActiveRecord
|
||||
def distinct_count_user_auth_by_provider(time_period)
|
||||
counts = auth_providers_except_ldap.each_with_object({}) do |provider, hash|
|
||||
hash[provider] = distinct_count(
|
||||
::AuthenticationEvent.success.for_provider(provider).where(time_period), :user_id)
|
||||
end
|
||||
|
||||
if any_ldap_auth_providers?
|
||||
counts['ldap'] = distinct_count(
|
||||
::AuthenticationEvent.success.ldap.where(time_period), :user_id
|
||||
)
|
||||
end
|
||||
|
||||
counts
|
||||
end
|
||||
# rubocop:enable CodeReuse/ActiveRecord
|
||||
|
||||
# rubocop:disable UsageData/LargeTable
|
||||
def auth_providers
|
||||
strong_memoize(:auth_providers) do
|
||||
::AuthenticationEvent.providers
|
||||
end
|
||||
end
|
||||
# rubocop:enable UsageData/LargeTable
|
||||
|
||||
def auth_providers_except_ldap
|
||||
auth_providers.reject { |provider| provider.starts_with?('ldap') }
|
||||
end
|
||||
|
||||
def any_ldap_auth_providers?
|
||||
auth_providers.any? { |provider| provider.starts_with?('ldap') }
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
11
spec/factories/authentication_event.rb
Normal file
11
spec/factories/authentication_event.rb
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
FactoryBot.define do
|
||||
factory :authentication_event do
|
||||
user
|
||||
provider { :standard }
|
||||
user_name { 'Jane Doe' }
|
||||
ip_address { '127.0.0.1' }
|
||||
result { :failed }
|
||||
end
|
||||
end
|
||||
|
|
@ -29,7 +29,8 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
|
|||
user_minimum_id user_maximum_id unique_visit_service
|
||||
deployment_minimum_id deployment_maximum_id
|
||||
approval_merge_request_rule_minimum_id
|
||||
approval_merge_request_rule_maximum_id)
|
||||
approval_merge_request_rule_maximum_id
|
||||
auth_providers)
|
||||
values.each do |key|
|
||||
expect(described_class).to receive(:clear_memoization).with(key)
|
||||
end
|
||||
|
|
@ -167,6 +168,8 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
|
|||
|
||||
describe 'usage_activity_by_stage_manage' do
|
||||
it 'includes accurate usage_activity_by_stage data' do
|
||||
described_class.clear_memoization(:auth_providers)
|
||||
|
||||
stub_config(
|
||||
omniauth:
|
||||
{ providers: omniauth_providers }
|
||||
|
|
@ -174,21 +177,29 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
|
|||
|
||||
for_defined_days_back do
|
||||
user = create(:user)
|
||||
user2 = create(:user)
|
||||
create(:event, author: user)
|
||||
create(:group_member, user: user)
|
||||
create(:authentication_event, user: user, provider: :ldapmain, result: :success)
|
||||
create(:authentication_event, user: user2, provider: :ldapsecondary, result: :success)
|
||||
create(:authentication_event, user: user2, provider: :group_saml, result: :success)
|
||||
create(:authentication_event, user: user2, provider: :group_saml, result: :success)
|
||||
create(:authentication_event, user: user, provider: :group_saml, result: :failed)
|
||||
end
|
||||
|
||||
expect(described_class.usage_activity_by_stage_manage({})).to include(
|
||||
events: 2,
|
||||
groups: 2,
|
||||
users_created: 4,
|
||||
omniauth_providers: ['google_oauth2']
|
||||
users_created: 6,
|
||||
omniauth_providers: ['google_oauth2'],
|
||||
user_auth_by_provider: { 'group_saml' => 2, 'ldap' => 4 }
|
||||
)
|
||||
expect(described_class.usage_activity_by_stage_manage(described_class.last_28_days_time_period)).to include(
|
||||
events: 1,
|
||||
groups: 1,
|
||||
users_created: 2,
|
||||
omniauth_providers: ['google_oauth2']
|
||||
users_created: 3,
|
||||
omniauth_providers: ['google_oauth2'],
|
||||
user_auth_by_provider: { 'group_saml' => 1, 'ldap' => 2 }
|
||||
)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -12,4 +12,35 @@ RSpec.describe AuthenticationEvent do
|
|||
it { is_expected.to validate_presence_of(:user_name) }
|
||||
it { is_expected.to validate_presence_of(:result) }
|
||||
end
|
||||
|
||||
describe 'scopes' do
|
||||
let_it_be(:ldap_event) { create(:authentication_event, provider: :ldapmain, result: :failed) }
|
||||
let_it_be(:google_oauth2) { create(:authentication_event, provider: :google_oauth2, result: :success) }
|
||||
|
||||
describe '.for_provider' do
|
||||
it 'returns events only for the specified provider' do
|
||||
expect(described_class.for_provider(:ldapmain)).to match_array ldap_event
|
||||
end
|
||||
end
|
||||
|
||||
describe '.ldap' do
|
||||
it 'returns all events for an LDAP provider' do
|
||||
expect(described_class.ldap).to match_array ldap_event
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '.providers' do
|
||||
before do
|
||||
create(:authentication_event, provider: :ldapmain)
|
||||
create(:authentication_event, provider: :google_oauth2)
|
||||
create(:authentication_event, provider: :standard)
|
||||
create(:authentication_event, provider: :standard)
|
||||
create(:authentication_event, provider: :standard)
|
||||
end
|
||||
|
||||
it 'returns an array of distinct providers' do
|
||||
expect(described_class.providers).to match_array %w(ldapmain google_oauth2 standard)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue