Add latest changes from gitlab-org/gitlab@master

2022-08-26 00:10:28 +00:00 · 2022-08-26 00:10:28 +00:00 · 34f4e3a054
parent 9b5b5f51f5
commit 34f4e3a054
12 changed files with 64 additions and 40 deletions
--- a/app/graphql/graphql_triggers.rb
+++ b/app/graphql/graphql_triggers.rb
@ -21,3 +21,5 @@ module GraphqlTriggers
    GitlabSchema.subscriptions.trigger('issuableDatesUpdated', { issuable_id: issuable.to_gid }, issuable)
  end
 end
+
+GraphqlTriggers.prepend_mod
--- a/app/graphql/types/subscription_type.rb
+++ b/app/graphql/types/subscription_type.rb
@ -25,3 +25,5 @@ module Types
          description: 'Triggered when the reviewers of a merge request are updated.'
  end
 end
+
+Types::SubscriptionType.prepend_mod
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@ -82,10 +82,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
    Feature.disabled?(:runner_registration_control) || Gitlab::CurrentSettings.valid_runner_registrars.include?('group')
  end

-  condition(:change_prevent_sharing_groups_outside_hierarchy_available) do
-    change_prevent_sharing_groups_outside_hierarchy_available?
-  end
-
  rule { can?(:read_group) & design_management_enabled }.policy do
    enable :read_design_activity
  end
@ -196,6 +192,7 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy

    enable :set_note_created_at
    enable :set_emails_disabled
+    enable :change_prevent_sharing_groups_outside_hierarchy
    enable :change_new_user_signups_cap
    enable :update_default_branch_protection
    enable :create_deploy_token
@ -204,10 +201,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
    enable :owner_access
  end

-  rule { owner & change_prevent_sharing_groups_outside_hierarchy_available }.policy do
-    enable :change_prevent_sharing_groups_outside_hierarchy
-  end
-
  rule { can?(:read_nested_project_resources) }.policy do
    enable :read_group_activity
    enable :read_group_issues
@ -335,10 +328,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
  def valid_dependency_proxy_deploy_token
    @user.is_a?(DeployToken) && @user&.valid_for_dependency_proxy? && @user&.has_access_to_group?(@subject)
  end
-
-  def change_prevent_sharing_groups_outside_hierarchy_available?
-    true
-  end
 end

 GroupPolicy.prepend_mod_with('GroupPolicy')
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@ -1467,7 +1467,8 @@ To delete the LDAP group link, provide either a `cn` or a `filter`, but not both

 ## SAML Group Links **(PREMIUM)**

-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/290367) in GitLab 15.3.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/290367) in GitLab 15.3.0.
+> - `access_level` type [changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95607) from `string` to `integer` in GitLab 15.3.2.

 List, get, add, and delete SAML group links.

@ -1490,7 +1491,7 @@ If successful, returns [`200`](index.md#status-codes) and the following response
 | Attribute          | Type    | Description                                                                  |
 |:-------------------|:--------|:-----------------------------------------------------------------------------|
 | `[].name`          | string  | Name of the SAML group                                                       |
-| `[].access_level`  | integer | [Access level](members.md#valid-access-levels) for members of the SAML group |
+| `[].access_level`  | integer | [Access level](members.md#valid-access-levels) for members of the SAML group. The attribute had a string type from GitLab 15.3.0 to GitLab 15.3.2 |

 Example request:

@ -1533,7 +1534,7 @@ If successful, returns [`200`](index.md#status-codes) and the following response
 | Attribute      | Type    | Description                                                                  |
 |:---------------|:--------|:-----------------------------------------------------------------------------|
 | `name`         | string  | Name of the SAML group                                                       |
-| `access_level` | integer | [Access level](members.md#valid-access-levels) for members of the SAML group |
+| `access_level` | integer | [Access level](members.md#valid-access-levels) for members of the SAML group. The attribute had a string type from GitLab 15.3.0 to GitLab 15.3.2 |

 Example request:

@ -1571,7 +1572,7 @@ If successful, returns [`201`](index.md#status-codes) and the following response
 | Attribute      | Type    | Description                                                                  |
 |:---------------|:--------|:-----------------------------------------------------------------------------|
 | `name`         | string  | Name of the SAML group                                                       |
-| `access_level` | integer | [Access level](members.md#valid-access-levels) for members of the SAML group |
+| `access_level` | integer | [Access level](members.md#valid-access-levels) for members of the for members of the SAML group. The attribute had a string type from GitLab 15.3.0 to GitLab 15.3.2 |

 Example request:

--- a/doc/development/value_stream_analytics.md
+++ b/doc/development/value_stream_analytics.md
@ -265,6 +265,31 @@ considered legacy, which will be phased out at some point.
  - Responsible for composing queries and define feature specific business logic.
  - `DataCollector`, `Event`, `StageEvents`, etc.

+## Frontend
+
+[Project VSA](../user/analytics/value_stream_analytics.md) is available for all users and:
+
+- Includes a mixture of key and DORA metrics based on the tier.
+- Uses the set of [default stages](#default-stages).
+
+[Group VSA](../user/group/value_stream_analytics/index.md) is only available for licensed users and extends project VSA to include:
+
+- An [overview stage](https://gitlab.com/gitlab-org/gitlab/-/issues/321438).
+- The ability to create custom value streams.
+
+The group and project level VSA frontends are both built with Vue and Vuex and follow a similar pattern:
+
+- The `index.js` file extracts any URL query parameters, creates the Vue app and Vuex store, and dispatches an `initialize` Vuex action.
+- The `base.vue` file is used to render the main components for each page, metrics, filters, charts, and the stage table.
+
+The group VSA Vuex store makes use of [Vuex modules](https://vuex.vuejs.org/guide/modules.html) to separate some of the state and logic used for rendering the charts.
+
+### Shared components
+
+Parts of the UI are shared between project VSA and group VSA such as the stage table and path. These shared components live in the project VSA directory `app/assets/javascripts/cycle_analytics/components` and are included at the group level VSA where needed. 
+
+All the frontend code for group-level features are located in `ee/app/assets/javascripts/analytics/cycle_analytics/components`.
+
 ## Testing

 Since we have a lots of events and possible pairings, testing each pairing is not possible. The rule is to have at least one test case using an `Event` class.
--- a/doc/update/index.md
+++ b/doc/update/index.md
@ -465,6 +465,11 @@ NOTE:
 Specific information that follow related to Ruby and Git versions do not apply to [Omnibus installations](https://docs.gitlab.com/omnibus/)
 and [Helm Chart deployments](https://docs.gitlab.com/charts/). They come with appropriate Ruby and Git versions and are not using system binaries for Ruby and Git. There is no need to install Ruby or Git when utilizing these two approaches.

+### 15.3.2
+
+In GitLab 15.3.2, [SAML Group Links](../api/groups.md#saml-group-links) API `access_level` attribute type changed to `integer`. See
+[valid access levels](../api/members.md#valid-access-levels) documentation.
+
 ### 15.2.0

 - GitLab installations that have multiple web nodes should be
--- a/doc/user/project/import/gitlab_com.md
+++ b/doc/user/project/import/gitlab_com.md
@ -5,29 +5,29 @@ group: Import
 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
 ---

-# Project importing from GitLab.com to your private GitLab instance **(FREE)**
+# Import a project from GitLab.com to your private GitLab instance **(FREE)**

-You can import your existing GitLab.com projects to your GitLab instance, but keep in
-mind that it is possible only if GitLab.com integration is enabled on your GitLab instance.
-[Read more about GitLab.com integration for self-managed GitLab instances](../../../integration/gitlab.md).
+You can import your existing GitLab.com projects to your GitLab instance.

-To get to the importer page you need to go to "New project" page.
+Prerequisite:

-NOTE:
-If you are interested in importing Wiki and merge request data to your new instance,
-you'll need to follow the instructions for [exporting a project](../settings/import_export.md#export-a-project-and-its-data)
+- GitLab.com integration must be enabled on your GitLab instance.
+  [Read more about GitLab.com integration for self-managed GitLab instances](../../../integration/gitlab.md).

-![New project page](img/gitlab_new_project_page_v12_2.png)
+To import a GitLab.com project to your self-managed GitLab instance:

-Go to the **Import Projects** tab, then select **GitLab.com**, and you are redirected to GitLab.com
-for permission to access your projects. After accepting, you are automatically redirected to the importer.
+1. On the top bar, select **Menu > Projects > Create new project**.
+1. Select **Import project**.
+1. Select **GitLab.com**.
+1. Give GitLab.com permission to access your projects.
+1. Select **Import**.

-![Importer page](img/gitlab_importer.png)
+The importer imports your repository and issues.
+When the importer is done, a new GitLab project is created with your imported data.

-To import a project, select **Import**. The importer imports your repository and issues.
-Once the importer is done, a new GitLab project is created with your imported data.
+## Related topics

-## Automate group and project import **(PREMIUM)**
-
-For information on automating user, group, and project import API calls, see
-[Automate group and project import](index.md#automate-group-and-project-import).
+- To automate user, group, and project import API calls, see
+  [Automate group and project import](index.md#automate-group-and-project-import).
+- To import Wiki and merge request data to your new instance,
+  see [exporting a project](../settings/import_export.md#export-a-project-and-its-data).
--- a/doc/user/project/import/img/gitlab_importer.png
+++ b/doc/user/project/import/img/gitlab_importer.png
--- a/doc/user/project/import/img/gitlab_new_project_page_v12_2.png
+++ b/doc/user/project/import/img/gitlab_new_project_page_v12_2.png
--- a/package.json
+++ b/package.json
@ -102,7 +102,7 @@
    "codesandbox-api": "0.0.23",
    "compression-webpack-plugin": "^5.0.2",
    "copy-webpack-plugin": "^6.4.1",
-    "core-js": "^3.24.1",
+    "core-js": "^3.25.0",
    "cron-validator": "^1.1.1",
    "cronstrue": "^1.122.0",
    "cropper": "^2.3.0",
--- a/spec/graphql/types/subscription_type_spec.rb
+++ b/spec/graphql/types/subscription_type_spec.rb
@ -13,6 +13,6 @@ RSpec.describe GitlabSchema.types['Subscription'] do
      merge_request_reviewers_updated
    ]

-    expect(described_class).to have_graphql_fields(*expected_fields).only
+    expect(described_class).to include_graphql_fields(*expected_fields)
  end
 end
--- a/yarn.lock
+++ b/yarn.lock
@ -3759,10 +3759,10 @@ core-js-pure@^3.0.0:
  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
  integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==

-core-js@^3.24.1:
-  version "3.24.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.24.1.tgz#cf7724d41724154010a6576b7b57d94c5d66e64f"
-  integrity sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg==
+core-js@^3.25.0:
+  version "3.25.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.0.tgz#be71d9e0dd648ffd70c44a7ec2319d039357eceb"
+  integrity sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==

 core-util-is@~1.0.0:
  version "1.0.3"