diff options
| -rw-r--r-- | .rubocop_todo/gitlab/strong_memoize_attr.yml | 1 | ||||
| -rw-r--r-- | data/removals/16_0/16-0-vulnerability-confidence-field.yml | 11 | ||||
| -rw-r--r-- | db/post_migrate/20230321163547_cleanup_conversion_big_int_ci_build_needs.rb | 10 | ||||
| -rw-r--r-- | db/post_migrate/20230411153310_cleanup_bigint_conversion_for_sent_notifications.rb | 10 | ||||
| -rw-r--r-- | doc/administration/audit_events.md | 17 | ||||
| -rw-r--r-- | doc/api/graphql/custom_emoji.md | 4 | ||||
| -rw-r--r-- | doc/integration/jira/connect-app.md | 8 | ||||
| -rw-r--r-- | doc/update/removals.md | 10 | ||||
| -rw-r--r-- | qa/qa/page/main/menu.rb | 2 | ||||
| -rw-r--r-- | qa/qa/page/project/sub_menus/super_sidebar/plan.rb | 8 |
10 files changed, 71 insertions, 10 deletions
diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml index 994a0c58c77..4274e59a2a9 100644 --- a/.rubocop_todo/gitlab/strong_memoize_attr.yml +++ b/.rubocop_todo/gitlab/strong_memoize_attr.yml @@ -356,7 +356,6 @@ Gitlab/StrongMemoizeAttr: - 'ee/app/models/gitlab_subscription.rb' - 'ee/app/models/issuables_analytics.rb' - 'ee/app/models/license.rb' - - 'ee/app/models/namespaces/storage/root_excess_size.rb' - 'ee/app/models/sca/license_compliance.rb' - 'ee/app/models/security/orchestration_policy_configuration.rb' - 'ee/app/models/security/orchestration_policy_rule_schedule.rb' diff --git a/data/removals/16_0/16-0-vulnerability-confidence-field.yml b/data/removals/16_0/16-0-vulnerability-confidence-field.yml new file mode 100644 index 00000000000..fe34947386d --- /dev/null +++ b/data/removals/16_0/16-0-vulnerability-confidence-field.yml @@ -0,0 +1,11 @@ +- title: "Vulnerability confidence field" + announcement_milestone: "15.4" + removal_milestone: "16.0" + breaking_change: true + reporter: abellucci + stage: Govern + issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372332 + body: | + In GitLab 15.3, [security report schemas below version 15 were deprecated](https://docs.gitlab.com/ee/update/deprecations.html#security-report-schemas-version-14xx). + The `confidence` attribute on vulnerability findings exists only in schema versions before `15-0-0` and in GitLab prior to 15.4. To maintain consistency + between the reports and our public APIs, the `confidence` attribute on any vulnerability-related components of our GraphQL API is now removed. diff --git a/db/post_migrate/20230321163547_cleanup_conversion_big_int_ci_build_needs.rb b/db/post_migrate/20230321163547_cleanup_conversion_big_int_ci_build_needs.rb index 4812cb2deca..680a496e639 100644 --- a/db/post_migrate/20230321163547_cleanup_conversion_big_int_ci_build_needs.rb +++ b/db/post_migrate/20230321163547_cleanup_conversion_big_int_ci_build_needs.rb @@ -1,15 +1,25 @@ # frozen_string_literal: true class CleanupConversionBigIntCiBuildNeeds < Gitlab::Database::Migration[2.1] + include Gitlab::Database::MigrationHelpers::ConvertToBigint + enable_lock_retries! TABLE = :ci_build_needs def up + return unless should_run? + cleanup_conversion_of_integer_to_bigint(TABLE, :id) end def down + return unless should_run? + restore_conversion_of_integer_to_bigint(TABLE, :id) end + + def should_run? + com_or_dev_or_test_but_not_jh? + end end diff --git a/db/post_migrate/20230411153310_cleanup_bigint_conversion_for_sent_notifications.rb b/db/post_migrate/20230411153310_cleanup_bigint_conversion_for_sent_notifications.rb index e5f690a0a5a..567fe4fb3d2 100644 --- a/db/post_migrate/20230411153310_cleanup_bigint_conversion_for_sent_notifications.rb +++ b/db/post_migrate/20230411153310_cleanup_bigint_conversion_for_sent_notifications.rb @@ -1,16 +1,26 @@ # frozen_string_literal: true class CleanupBigintConversionForSentNotifications < Gitlab::Database::Migration[2.1] + include Gitlab::Database::MigrationHelpers::ConvertToBigint + enable_lock_retries! TABLE = :sent_notifications COLUMNS = [:id] def up + return unless should_run? + cleanup_conversion_of_integer_to_bigint(TABLE, COLUMNS) end def down + return unless should_run? + restore_conversion_of_integer_to_bigint(TABLE, COLUMNS) end + + def should_run? + com_or_dev_or_test_but_not_jh? + end end diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md index 91a3afba5d2..50bd943b8e4 100644 --- a/doc/administration/audit_events.md +++ b/doc/administration/audit_events.md @@ -363,26 +363,31 @@ GitLab generates audit events when a cluster agent token is created or revoked. The following user actions on a GitLab instance generate instance audit events: +#### Authentication + - Sign-in events and the authentication type such as standard, LDAP, or OmniAuth. - Failed sign-ins. +- Ask for password reset. +- Grant OAuth access. +- Failed second-factor authentication attempt. +- A user's personal access token was successfully or unsuccessfully created or revoked. +- A user's two-factor authentication was disabled. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/238177) in + GitLab 15.1. + +#### User management + - Added SSH key. - Added or removed email. - Changed password. -- Ask for password reset. -- Grant OAuth access. - Started or stopped user impersonation. - Changed username. - User was added or deleted. - User requests access to an instance. - User was approved, rejected, or blocked using the Admin Area. - User was blocked using the API. -- Failed second-factor authentication attempt. -- A user's personal access token was successfully or unsuccessfully created or revoked. - Administrator added or removed. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/323905) in GitLab 14.1. - Removed SSH key. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/220127) in GitLab 14.1. - Added or removed GPG key. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/220127) in GitLab 14.1. -- A user's two-factor authentication was disabled. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/238177) in - GitLab 15.1. - Enabled Admin Mode. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/362101) in GitLab 15.7. - All [group events](#group-events) and [project events](#project-events). - User was unblocked using the Admin Area or API. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115727) in GitLab 15.11. diff --git a/doc/api/graphql/custom_emoji.md b/doc/api/graphql/custom_emoji.md index 9c794a080c9..25ae37b75a9 100644 --- a/doc/api/graphql/custom_emoji.md +++ b/doc/api/graphql/custom_emoji.md @@ -14,13 +14,13 @@ On self-managed GitLab, by default this feature is not available. To make it ava On GitLab.com, this feature is available. This feature is ready for production use. -To use custom emojis in comments and descriptions, you can add them to a group using the GraphQL API. +To use custom emojis in comments and descriptions, you can add them to a top-level group using the GraphQL API. Parameters: | Attribute | Type | Required | Description | | :----------- | :------------- | :--------------------- | :------------------------------------------------------------------------ | -| `group_path` | integer/string | **{check-circle}** Yes | ID or [URL-encoded path of the group](../rest/index.md#namespaced-path-encoding) | +| `group_path` | integer/string | **{check-circle}** Yes | ID or [URL-encoded path of the top-level group](../rest/index.md#namespaced-path-encoding) | | `name` | string | **{check-circle}** Yes | Name of the custom emoji. | | `file` | string | **{check-circle}** Yes | URL of the custom emoji image. | diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md index 82dc32b1293..06aa8c218dd 100644 --- a/doc/integration/jira/connect-app.md +++ b/doc/integration/jira/connect-app.md @@ -255,7 +255,13 @@ To resolve this issue, set up [OAuth authentication](#set-up-oauth-authenticatio ### Manual installation fails -You might get an error if you have installed the GitLab for Jira Cloud app from the official marketplace listing and replaced it with manual installation. To resolve this issue, disable the **Jira Connect Proxy URL** setting. +You might get an error if you have installed the GitLab for Jira Cloud app from the official marketplace listing and replaced it with manual installation: + +```plaintext +The app "gitlab-jira-connect-gitlab.com" could not be installed as a local app as it has previously been installed from Atlassian Marketplace +``` + +To resolve this issue, disable the **Jira Connect Proxy URL** setting. - In GitLab 15.7: diff --git a/doc/update/removals.md b/doc/update/removals.md index d017e01a14b..a7cde5bbc74 100644 --- a/doc/update/removals.md +++ b/doc/update/removals.md @@ -64,6 +64,16 @@ is removed in favor of more specialized fields like: - `infrastructure_access_level` - `monitor_access_level` +### Vulnerability confidence field + +WARNING: +This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/). +Review the details carefully before upgrading. + +In GitLab 15.3, [security report schemas below version 15 were deprecated](https://docs.gitlab.com/ee/update/deprecations.html#security-report-schemas-version-14xx). +The `confidence` attribute on vulnerability findings exists only in schema versions before `15-0-0` and in GitLab prior to 15.4. To maintain consistency +between the reports and our public APIs, the `confidence` attribute on any vulnerability-related components of our GraphQL API is now removed. + ## Removed in 15.11 ### Exporting and importing projects in JSON format not supported diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb index 878d34b2322..2deca64a9ac 100644 --- a/qa/qa/page/main/menu.rb +++ b/qa/qa/page/main/menu.rb @@ -184,6 +184,8 @@ module QA within_user_menu do has_element?(:user_profile_link, text: /#{user.username}/) end + # we need to close user menu because plain user link check will leave it open + click_element :user_avatar_content if has_element?(:user_profile_link, wait: 0) end def not_signed_in? diff --git a/qa/qa/page/project/sub_menus/super_sidebar/plan.rb b/qa/qa/page/project/sub_menus/super_sidebar/plan.rb index ca81837b2e2..fe45bb6bb65 100644 --- a/qa/qa/page/project/sub_menus/super_sidebar/plan.rb +++ b/qa/qa/page/project/sub_menus/super_sidebar/plan.rb @@ -17,6 +17,14 @@ module QA def go_to_requirements open_plan_submenu("Requirements") end + + def go_to_jira_issues + open_plan_submenu("Jira issues") + end + + def go_to_open_jira + open_plan_submenu("Open Jira") + end end end end |