diff options
| -rw-r--r-- | app/assets/javascripts/pages/projects/jobs/index/index.js | 30 | ||||
| -rw-r--r-- | app/models/commit_with_pipeline.rb | 38 | ||||
| -rw-r--r-- | doc/api/groups.md | 2 | ||||
| -rw-r--r-- | doc/subscriptions/bronze_starter.md | 4 | ||||
| -rw-r--r-- | doc/user/admin_area/settings/visibility_and_access_controls.md | 2 | ||||
| -rw-r--r-- | doc/user/group/img/group_activity_analytics_v12_10.png | bin | 56709 -> 0 bytes | |||
| -rw-r--r-- | doc/user/group/img/group_activity_analytics_v13_10.png | bin | 0 -> 42111 bytes | |||
| -rw-r--r-- | doc/user/group/img/ldap_sync_cn_v13_1.png | bin | 38094 -> 0 bytes | |||
| -rw-r--r-- | doc/user/group/img/ldap_sync_filter_v13_1.png | bin | 44302 -> 0 bytes | |||
| -rw-r--r-- | doc/user/group/img/manual_permissions_v13_7.png | bin | 69289 -> 0 bytes | |||
| -rw-r--r-- | doc/user/group/index.md | 112 | ||||
| -rw-r--r-- | doc/user/permissions.md | 2 |
12 files changed, 61 insertions, 129 deletions
diff --git a/app/assets/javascripts/pages/projects/jobs/index/index.js b/app/assets/javascripts/pages/projects/jobs/index/index.js index 6a70d4cf26d..681d151b77f 100644 --- a/app/assets/javascripts/pages/projects/jobs/index/index.js +++ b/app/assets/javascripts/pages/projects/jobs/index/index.js @@ -1,19 +1,17 @@ import Vue from 'vue'; import GlCountdown from '~/vue_shared/components/gl_countdown.vue'; -document.addEventListener('DOMContentLoaded', () => { - const remainingTimeElements = document.querySelectorAll('.js-remaining-time'); - remainingTimeElements.forEach( - (el) => - new Vue({ - el, - render(h) { - return h(GlCountdown, { - props: { - endDateString: el.dateTime, - }, - }); - }, - }), - ); -}); +const remainingTimeElements = document.querySelectorAll('.js-remaining-time'); +remainingTimeElements.forEach( + (el) => + new Vue({ + el, + render(h) { + return h(GlCountdown, { + props: { + endDateString: el.dateTime, + }, + }); + }, + }), +); diff --git a/app/models/commit_with_pipeline.rb b/app/models/commit_with_pipeline.rb deleted file mode 100644 index 7f952fb77a0..00000000000 --- a/app/models/commit_with_pipeline.rb +++ /dev/null @@ -1,38 +0,0 @@ -# frozen_string_literal: true - -class Ci::CommitWithPipeline < SimpleDelegator - include Presentable - - def initialize(commit) - @latest_pipelines = {} - super(commit) - end - - def pipelines - project.ci_pipelines.where(sha: sha) - end - - def last_pipeline - strong_memoize(:last_pipeline) do - pipelines.last - end - end - - def latest_pipeline(ref = nil) - @latest_pipelines.fetch(ref) do |ref| - @latest_pipelines[ref] = latest_pipeline_for_project(ref, project) - end - end - - def latest_pipeline_for_project(ref, pipeline_project) - pipeline_project.ci_pipelines.latest_pipeline_per_commit(id, ref)[id] - end - - def set_latest_pipeline_for_ref(ref, pipeline) - @latest_pipelines[ref] = pipeline - end - - def status(ref = nil) - latest_pipeline(ref)&.status - end -end diff --git a/doc/api/groups.md b/doc/api/groups.md index 6031d780436..b3ab00b362e 100644 --- a/doc/api/groups.md +++ b/doc/api/groups.md @@ -1258,7 +1258,7 @@ Read more in the [Group Import/Export](group_import_export.md) documentation. ## Share Groups with Groups -These endpoints create and delete links for sharing a group with another group. For more information, see the related discussion in the [GitLab Groups](../user/group/index.md#sharing-a-group-with-another-group) page. +These endpoints create and delete links for sharing a group with another group. For more information, see the related discussion in the [GitLab Groups](../user/group/index.md#share-a-group-with-another-group) page. ### Create a link to share a group with another group diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md index d66acb4b3f2..7f0b106978c 100644 --- a/doc/subscriptions/bronze_starter.md +++ b/doc/subscriptions/bronze_starter.md @@ -23,11 +23,11 @@ the tiers are no longer mentioned in GitLab documentation: - [Setting a default template for merge requests and issues](../user/project/description_templates.md#set-a-default-template-for-merge-requests-and-issues) - [Email from GitLab](../tools/email.md) - Groups: - - [Creating group memberships via CN](../user/group/index.md#creating-group-links-via-cn) + - [Creating group memberships via CN](../user/group/index.md#create-group-links-via-cn) - [Group push rules](../user/group/index.md#group-push-rules) - [Managing group memberships via LDAP](../user/group/index.md#manage-group-memberships-via-ldap) - [Member locking](../user/group/index.md#prevent-members-from-being-added-to-a-group) - - [Overriding user permissions](../user/group/index.md#overriding-user-permissions) + - [Overriding user permissions](../user/group/index.md#override-user-permissions) - [User contribution analysis](../user/group/index.md#user-contribution-analysis) - [Kerberos integration](../integration/kerberos.md) - Issue Boards: diff --git a/doc/user/admin_area/settings/visibility_and_access_controls.md b/doc/user/admin_area/settings/visibility_and_access_controls.md index c0d1a3ec48f..00a49f1b974 100644 --- a/doc/user/admin_area/settings/visibility_and_access_controls.md +++ b/doc/user/admin_area/settings/visibility_and_access_controls.md @@ -55,7 +55,7 @@ To change the default project creation protection: 1. Select the desired option. 1. Click **Save changes**. -For more details, see [Default project-creation level](../../group/index.md#default-project-creation-level). +For more details, see [Specify who can add projects to a group](../../group/index.md#specify-who-can-add-projects-to-a-group). ## Default project deletion protection **(PREMIUM SELF)** diff --git a/doc/user/group/img/group_activity_analytics_v12_10.png b/doc/user/group/img/group_activity_analytics_v12_10.png Binary files differdeleted file mode 100644 index e49594c155b..00000000000 --- a/doc/user/group/img/group_activity_analytics_v12_10.png +++ /dev/null diff --git a/doc/user/group/img/group_activity_analytics_v13_10.png b/doc/user/group/img/group_activity_analytics_v13_10.png Binary files differnew file mode 100644 index 00000000000..974609de588 --- /dev/null +++ b/doc/user/group/img/group_activity_analytics_v13_10.png diff --git a/doc/user/group/img/ldap_sync_cn_v13_1.png b/doc/user/group/img/ldap_sync_cn_v13_1.png Binary files differdeleted file mode 100644 index 279b3192328..00000000000 --- a/doc/user/group/img/ldap_sync_cn_v13_1.png +++ /dev/null diff --git a/doc/user/group/img/ldap_sync_filter_v13_1.png b/doc/user/group/img/ldap_sync_filter_v13_1.png Binary files differdeleted file mode 100644 index 655bed58d46..00000000000 --- a/doc/user/group/img/ldap_sync_filter_v13_1.png +++ /dev/null diff --git a/doc/user/group/img/manual_permissions_v13_7.png b/doc/user/group/img/manual_permissions_v13_7.png Binary files differdeleted file mode 100644 index fcea0121915..00000000000 --- a/doc/user/group/img/manual_permissions_v13_7.png +++ /dev/null diff --git a/doc/user/group/index.md b/doc/user/group/index.md index 52d42584407..99451b7fec4 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -155,7 +155,7 @@ To find members in a group, you can sort, filter, or search. Filter a group to find members. By default, all members in the group and subgroups are displayed. -1. Go to the group and select **Members** (**{users}**). +1. Go to the group and select **Members**. 1. Above the list of members, in the **Filter members** box, enter filter criteria. - To view members in the group only, select **Membership = Direct**. - To view members of the group and its subgroups, select **Membership = Inherited**. @@ -165,7 +165,7 @@ Filter a group to find members. By default, all members in the group and subgrou You can search for members by name, username, or email. -1. Go to the group and select **Members** (**{users}**). +1. Go to the group and select **Members**. 1. Above the list of members, in the **Filter members** box, enter search criteria. 1. To the right of the **Filter members** box, select the magnifying glass (**{search}**). @@ -173,7 +173,7 @@ You can search for members by name, username, or email. You can sort members by **Account**, **Access granted**, **Max role**, or **Last sign-in**. -1. Go to the group and select **Members** (**{users}**). +1. Go to the group and select **Members**. 1. Above the list of members, on the top right, from the **Account** list, select the criteria to filter by. 1. To switch the sort between ascending and descending, to the right of the **Account** list, select the @@ -222,7 +222,7 @@ There are two different ways to add a new project to a group:  -### Default project-creation level +### Specify who can add projects to a group > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2534) in [GitLab Premium](https://about.gitlab.com/pricing/) 10.5. > - Brought to [GitLab Starter](https://about.gitlab.com/pricing/) in 10.7. @@ -239,131 +239,103 @@ To change this setting for a specific group: To change this setting globally, see [Default project creation protection](../admin_area/settings/visibility_and_access_controls.md#default-project-creation-protection). -## View group details - -A group's **Details** page includes tabs for: - -- Subgroups and projects. -- Shared projects. -- Archived projects. - -### Group activity analytics overview +## Group activity analytics **(PREMIUM)** > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207164) in GitLab [Starter](https://about.gitlab.com/pricing/) 12.10 as -a [beta feature](https://about.gitlab.com/handbook/product/#beta) - -The group details view also shows the number of the following items created in the last 90 days: **(PREMIUM)** +a [beta feature](https://about.gitlab.com/handbook/product/#beta). -- Merge requests. -- Issues. -- Members. +For a group, you can view how many merge requests, issues, and members were created in the last 90 days. These Group Activity Analytics can be enabled with the `group_activity_analytics` [feature flag](../../development/feature_flags/development.md#enabling-a-feature-flag-locally-in-development). - - -For details, see the section on how you can [View group activity](#view-group-activity). - -## View group activity - -A group's **Activity** page displays the most recent actions taken in a group, including: + -- **Push events**: Recent pushes to branches. -- **Merge events**: Recent merges. -- **Issue events**: Issues opened or closed. -- **Epic events**: Epics opened or closed. -- **Comments**: Comments opened or closed. -- **Team**: Team members who have joined or left the group. -- **Wiki**: Wikis created, deleted, or updated. +### View group activity -The entire activity feed is also available in Atom format by clicking the -**RSS** icon. +You can view the most recent actions taken in a group. -To view a group's **Activity** page: +1. From the top menu, select **Groups > Your Groups**. +1. Find the group and select it. +1. From the left menu, select **Group overview > Activity**. -1. Go to the group's page. -1. In the left navigation menu, go to **Group Overview** and select **Activity**. +To view the activity feed in Atom format, select the +**RSS** (**{rss}**) icon. ## Transfer projects into groups Learn how to [transfer a project into a group](../project/settings/index.md#transferring-an-existing-project-into-another-namespace). -## Sharing a project with a group +## Share a project with a group You can [share your projects with a group](../project/members/share_project_with_groups.md) and give all group members access to the project at once. Alternatively, you can [lock the sharing with group feature](#prevent-a-project-from-being-shared-with-groups). -## Sharing a group with another group +## Share a group with another group > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/18328) in GitLab 12.7. -Similarly to [sharing a project with a group](#sharing-a-project-with-a-group), -you can share a group with another group to give direct group members access +Similar to how you [share a project with a group](#share-a-project-with-a-group), +you can share a group with another group. Members get direct access to the shared group. This is not valid for inherited members. -To share a given group, for example, 'Frontend' with another group, for example, -'Engineering': +To share a given group, for example, `Frontend` with another group, for example, +`Engineering`: -1. Navigate to your 'Frontend' group page and use the left navigation menu to go - to your group **Members**. +1. Go to the `Frontend` group. +1. From the left menu, select **Members**. 1. Select the **Invite group** tab. -1. Add 'Engineering' with the maximum access level of your choice. -1. Click **Invite**. +1. In the **Select a group to invite** list, select `Engineering`. +1. For the **Max access level**, select an access level. +1. Select **Invite**. -All the members of the 'Engineering' group will have been added to 'Frontend'. +All the members of the `Engineering` group are added to the `Frontend` group. ## Manage group memberships via LDAP **(PREMIUM SELF)** -Group syncing allows LDAP groups to be mapped to GitLab groups. This provides more control over per-group user management. To configure group syncing edit the `group_base` **DN** (`'OU=Global Groups,OU=GitLab INT,DC=GitLab,DC=org'`). This **OU** contains all groups that will be associated with GitLab groups. +Group syncing allows LDAP groups to be mapped to GitLab groups. This provides more control over per-group user management. To configure group syncing, edit the `group_base` **DN** (`'OU=Global Groups,OU=GitLab INT,DC=GitLab,DC=org'`). This **OU** contains all groups that will be associated with GitLab groups. -Group links can be created using either a CN or a filter. These group links are created on the **Group Settings -> LDAP Synchronization** page. After configuring the link, it may take over an hour for the users to sync with the GitLab group. +Group links can be created by using either a CN or a filter. To create these group links, go to the group's **Settings > LDAP Synchronization** page. After configuring the link, it may take more than an hour for the users to sync with the GitLab group. For more information on the administration of LDAP and group sync, refer to the [main LDAP documentation](../../administration/auth/ldap/index.md#group-sync). NOTE: -If an LDAP user is a group member when LDAP Synchronization is added, and they are not part of the LDAP group, they will be removed from the group. +If an LDAP user is a group member when LDAP Synchronization is added, and they are not part of the LDAP group, they are removed from the group. -### Creating group links via CN **(PREMIUM SELF)** +### Create group links via CN **(PREMIUM SELF)** To create group links via CN: <!-- vale gitlab.Spelling = NO --> 1. Select the **LDAP Server** for the link. -1. Select `LDAP Group cn` as the **Sync method**. -1. In the **LDAP Group cn** text input box, begin typing the CN of the group. There will be a dropdown menu with matching CNs within the configured `group_base`. Select your CN from this list. +1. As the **Sync method**, select `LDAP Group cn`. +1. In the **LDAP Group cn** text input box, begin typing the CN of the group. There is a dropdown menu with matching CNs within the configured `group_base`. Select your CN from this list. 1. In the **LDAP Access** section, select the [permission level](../permissions.md) for users synced in this group. -1. Click the `Add Synchronization` button to save this group link. - - +1. Select the **Add Synchronization** button. <!-- vale gitlab.Spelling = YES --> -### Creating group links via filter **(PREMIUM SELF)** +### Create group links via filter **(PREMIUM SELF)** To create group links via filter: 1. Select the **LDAP Server** for the link. -1. Select `LDAP user filter` as the **Sync method**. +1. As the **Sync method**, select `LDAP user filter`. 1. Input your filter in the **LDAP User filter** box. Follow the [documentation on user filters](../../administration/auth/ldap/index.md#set-up-ldap-user-filter). 1. In the **LDAP Access** section, select the [permission level](../permissions.md) for users synced in this group. -1. Click the `Add Synchronization` button to save this group link. - - +1. Select the **Add Synchronization** button. -### Overriding user permissions **(PREMIUM SELF)** +### Override user permissions **(PREMIUM SELF)** -In GitLab [8.15](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/822) and later, LDAP user permissions can now be manually overridden by an admin user. To override a user's permissions: +LDAP user permissions can be manually overridden by an admin user. To override a user's permissions: 1. Go to your group's **Members** page. -1. Select the pencil icon in the row for the user you are editing. -1. Select the brown `Edit permissions` button in the modal. - - +1. In the row for the user you are editing, select the pencil (**{pencil}**) icon. +1. Select the brown **Edit permissions** button in the modal. -Now you will be able to edit the user's permissions from the **Members** page. +Now you can edit the user's permissions from the **Members** page. ## Epics **(ULTIMATE)** diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 699ba645e87..c225f27335c 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -304,7 +304,7 @@ group. 1. Introduced in GitLab 12.2. 1. Default project creation role can be changed at: - 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). + - The [group level](group/index.md#specify-who-can-add-projects-to-a-group). 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#change-the-default-branch-protection-of-a-group) is set to "Partially protected" or "Not protected". 1. In addition, if your group is public or internal, all users who can see the group can also see group wiki pages. |
