.gitlab/ci/rules.gitlab-ci.yml

@@ -1495,12 +1495,6 @@
       changes: ["vendor/gems/mail-smtp_pool/**/*"]
     - <<: *if-merge-request-labels-run-all-rspec
 
-.vendor:rules:ipynbdiff:
-  rules:
-    - <<: *if-merge-request
-      changes: ["vendor/gems/ipynbdiff/**/*"]
-    - <<: *if-merge-request-labels-run-all-rspec
-
 ##################
 # Releases rules #
 ##################

.gitlab/ci/vendored-gems.gitlab-ci.yml

@@ -5,10 +5,3 @@ vendor mail-smtp_pool:
   trigger:
     include: vendor/gems/mail-smtp_pool/.gitlab-ci.yml
     strategy: depend
-vendor ipynbdiff:
-  extends:
-    - .vendor:rules:ipynbdiff
-  needs: []
-  trigger:
-    include: vendor/gems/ipynbdiff/.gitlab-ci.yml
-    strategy: depend

Gemfile

@@ -546,6 +546,6 @@ gem 'ipaddress', '~> 0.8.3'
 
 gem 'parslet', '~> 1.8'
 
-gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'
+gem 'ipynbdiff', '0.4.7'
 
 gem 'ed25519', '~> 1.3.0'

Gemfile.lock

-PATH
-  remote: vendor/gems/ipynbdiff
-  specs:
-    ipynbdiff (0.4.7)
-      diffy (~> 3.3)
-      json (~> 2.5, >= 2.5.1)
-
 PATH
   remote: vendor/gems/mail-smtp_pool
   specs:
@@ -674,6 +667,9 @@ GEM
     invisible_captcha (1.1.0)
       rails (>= 4.2)
     ipaddress (0.8.3)
+    ipynbdiff (0.4.7)
+      diffy (~> 3.3)
+      json (~> 2.5, >= 2.5.1)
     jaeger-client (1.1.0)
       opentracing (~> 0.3)
       thrift
@@ -1579,7 +1575,7 @@ DEPENDENCIES
   icalendar
   invisible_captcha (~> 1.1.0)
   ipaddress (~> 0.8.3)
-  ipynbdiff!
+  ipynbdiff (= 0.4.7)
   jira-ruby (~> 2.1.4)
   js_regex (~> 3.7)
   json (~> 2.5.1)

app/assets/javascripts/graphql_shared/possible_types.json

@@ -131,6 +131,7 @@
     "VulnerabilityLocationSecretDetection"
   ],
   "WorkItemWidget": [
+    "WorkItemWidgetAssignees",
     "WorkItemWidgetDescription",
     "WorkItemWidgetHierarchy"
   ]

app/assets/javascripts/pipelines/components/header_component.vue

@@ -63,6 +63,18 @@ export default {
       default: '',
     },
   },
+  modal: {
+    id: DELETE_MODAL_ID,
+    actionPrimary: {
+      text: __('Delete pipeline'),
+      attributes: {
+        variant: 'danger',
+      },
+    },
+    actionCancel: {
+      text: __('Cancel'),
+    },
+  },
   apollo: {
     pipeline: {
       context() {
@@ -275,7 +287,7 @@ export default {
 
       <gl-button
         v-if="pipeline.userPermissions.destroyPipeline"
-        v-gl-modal="$options.DELETE_MODAL_ID"
+        v-gl-modal="$options.modal.id"
         :loading="isDeleting"
         :disabled="isDeleting"
         class="gl-ml-3"
@@ -289,11 +301,11 @@ export default {
     <gl-loading-icon v-if="isLoadingInitialQuery" size="lg" class="gl-mt-3 gl-mb-3" />
 
     <gl-modal
-      :modal-id="$options.DELETE_MODAL_ID"
+      :modal-id="$options.modal.id"
       :title="__('Delete pipeline')"
-      :ok-title="__('Delete pipeline')"
-      ok-variant="danger"
-      @ok="deletePipeline()"
+      :action-primary="$options.modal.actionPrimary"
+      :action-cancel="$options.modal.actionCancel"
+      @primary="deletePipeline()"
     >
       <p>
         {{ deleteModalConfirmationText }}

app/graphql/types/ci/variable_type.rb

+# frozen_string_literal: true
+
+module Types
+  module Ci
+    # rubocop: disable Graphql/AuthorizeTypes
+    class VariableType < BaseObject
+      graphql_name 'CiVariable'
+
+      field :id, GraphQL::Types::ID, null: false,
+        description: 'ID of the variable.'
+
+      field :key, GraphQL::Types::String, null: true,
+        description: 'Name of the variable.'
+
+      field :value, GraphQL::Types::String, null: true,
+        description: 'Value of the variable.'
+
+      field :variable_type, ::Types::Ci::VariableTypeEnum, null: true,
+        description: 'Type of the variable.'
+
+      field :protected, GraphQL::Types::Boolean, null: true,
+        description: 'Indicates whether the variable is protected.'
+
+      field :masked, GraphQL::Types::Boolean, null: true,
+        description: 'Indicates whether the variable is masked.'
+
+      field :raw, GraphQL::Types::Boolean, null: true,
+        description: 'Indicates whether the variable is raw.'
+    end
+  end
+end

app/graphql/types/ci/variable_type_enum.rb

+# frozen_string_literal: true
+
+module Types
+  module Ci
+    class VariableTypeEnum < BaseEnum
+      graphql_name 'CiVariableType'
+
+      ::Ci::Variable.variable_types.keys.each do |variable_type|
+        value variable_type.upcase, value: variable_type, description: "#{variable_type.humanize} type."
+      end
+    end
+  end
+end

app/graphql/types/group_type.rb

@@ -194,6 +194,13 @@ class GroupType < NamespaceType
           complexity: 5,
           resolver: Resolvers::GroupsResolver
 
+    field :ci_variables,
+          Types::Ci::VariableType.connection_type,
+          null: true,
+          description: "List of the group's CI/CD variables.",
+          authorize: :admin_group,
+          method: :variables
+
     field :runners, Types::Ci::RunnerType.connection_type,
           null: true,
           resolver: Resolvers::Ci::GroupRunnersResolver,

app/graphql/types/project_type.rb

@@ -220,6 +220,13 @@ class ProjectType < BaseObject
           description: 'Build pipeline counts of the project.',
           resolver: Resolvers::Ci::ProjectPipelineCountsResolver
 
+    field :ci_variables,
+          Types::Ci::VariableType.connection_type,
+          null: true,
+          description: "List of the project's CI/CD variables.",
+          authorize: :admin_build,
+          method: :variables
+
     field :ci_cd_settings,
           Types::Ci::CiCdSettingType,
           null: true,

app/graphql/types/query_type.rb

@@ -123,6 +123,11 @@ class QueryType < ::Types::BaseObject
           resolver: Resolvers::Ci::RunnersResolver,
           description: "Find runners visible to the current user."
 
+    field :ci_variables,
+          Types::Ci::VariableType.connection_type,
+          null: true,
+          description: "List of the instance's CI/CD variables."
+
     field :ci_config, resolver: Resolvers::Ci::ConfigResolver, complexity: 126 # AUTHENTICATED_MAX_COMPLEXITY / 2 + 1
 
     field :timelogs, Types::TimelogType.connection_type,
@@ -178,6 +183,12 @@ def ci_application_settings
       application_settings
     end
 
+    def ci_variables
+      return unless current_user.can_admin_all_resources?
+
+      ::Ci::InstanceVariable.all
+    end
+
     def application_settings
       Gitlab::CurrentSettings.current_application_settings
     end

app/graphql/types/work_items/widget_interface.rb

@@ -16,13 +16,16 @@ def self.resolve_type(object, context)
           ::Types::WorkItems::Widgets::DescriptionType
         when ::WorkItems::Widgets::Hierarchy
           ::Types::WorkItems::Widgets::HierarchyType
+        when ::WorkItems::Widgets::Assignees
+          ::Types::WorkItems::Widgets::AssigneesType
         else
           raise "Unknown GraphQL type for widget #{object}"
         end
       end
 
       orphan_types ::Types::WorkItems::Widgets::DescriptionType,
-                   ::Types::WorkItems::Widgets::HierarchyType
+                   ::Types::WorkItems::Widgets::HierarchyType,
+                   ::Types::WorkItems::Widgets::AssigneesType
     end
   end
 end

app/graphql/types/work_items/widgets/assignees_type.rb

+# frozen_string_literal: true
+
+module Types
+  module WorkItems
+    module Widgets
+      # Disabling widget level authorization as it might be too granular
+      # and we already authorize the parent work item
+      # rubocop:disable Graphql/AuthorizeTypes
+      class AssigneesType < BaseObject
+        graphql_name 'WorkItemWidgetAssignees'
+        description 'Represents an assignees widget'
+
+        implements Types::WorkItems::WidgetInterface
+
+        field :assignees, Types::UserType.connection_type, null: true,
+              description: 'Assignees of the work item.'
+
+        field :allows_multiple_assignees, GraphQL::Types::Boolean, null: true, method: :allows_multiple_assignees?,
+              description: 'Indicates whether multiple assignees are allowed.'
+      end
+      # rubocop:enable Graphql/AuthorizeTypes
+    end
+  end
+end

app/models/work_items/type.rb

@@ -21,11 +21,11 @@ class Type < ApplicationRecord
     }.freeze
 
     WIDGETS_FOR_TYPE = {
-      issue: [Widgets::Description, Widgets::Hierarchy],
+      issue: [Widgets::Description, Widgets::Hierarchy, Widgets::Assignees],
       incident: [Widgets::Description],
       test_case: [Widgets::Description],
       requirement: [Widgets::Description],
-      task: [Widgets::Description, Widgets::Hierarchy]
+      task: [Widgets::Description, Widgets::Hierarchy, Widgets::Assignees]
     }.freeze
 
     cache_markdown_field :description, pipeline: :single_line

app/models/work_items/widgets/assignees.rb

+# frozen_string_literal: true
+
+module WorkItems
+  module Widgets
+    class Assignees < Base
+      delegate :assignees, to: :work_item
+      delegate :allows_multiple_assignees?, to: :work_item
+    end
+  end
+end

app/services/users/activity_service.rb

@@ -34,6 +34,8 @@ def record_activity
       return unless lease.try_obtain
 
       @user.update_attribute(:last_activity_on, today)
+
+      Gitlab::UsageDataCounters::HLLRedisCounter.track_event('unique_active_user', values: @user.id)
     end
   end
 end

config/metrics/counts_28d/20220525231314_unique_monthly_active_users.yml

@@ -7,9 +7,10 @@ product_section: dev
 product_stage: manage
 product_group: manage
 value_type: number
-status: active
+status: removed
 milestone: "15.1"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88631
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88631/
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90468/
 time_frame: 28d
 data_source: database
 data_category: optional

config/metrics/counts_28d/20220621085114_unque_active_users_monthly.yml

+---
+key_path: redis_hll_counters.manage.unque_active_users_monthly
+description: Users that have a last_activity_on date within the past 28 days
+product_section: dev
+product_stage: manage
+product_group: manage
+value_type: number
+status: active
+milestone: "15.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90468/
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - unique_active_user
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate

doc/api/graphql/reference/index.md

@@ -87,6 +87,16 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | ---- | ---- | ----------- |
 | <a id="queryciminutesusagenamespaceid"></a>`namespaceId` | [`NamespaceID`](#namespaceid) | Global ID of the Namespace for the monthly CI/CD minutes usage. |
+### `Query.ciVariables`
+
+List of the instance's CI/CD variables.
+
+Returns [`CiVariableConnection`](#civariableconnection).
+
+This field returns a [connection](#connections). It accepts the
+four standard [pagination arguments](#connection-pagination-arguments):
+`before: String`, `after: String`, `first: Int`, `last: Int`.
+
 ### `Query.containerRepository`
 Find a container repository.
@@ -6248,6 +6258,29 @@ The edge type for [`CiStage`](#cistage).
 | <a id="cistageedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. |
 | <a id="cistageedgenode"></a>`node` | [`CiStage`](#cistage) | The item at the end of the edge. |
+#### `CiVariableConnection`
+
+The connection type for [`CiVariable`](#civariable).
+
+##### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="civariableconnectionedges"></a>`edges` | [`[CiVariableEdge]`](#civariableedge) | A list of edges. |
+| <a id="civariableconnectionnodes"></a>`nodes` | [`[CiVariable]`](#civariable) | A list of nodes. |
+| <a id="civariableconnectionpageinfo"></a>`pageInfo` | [`PageInfo!`](#pageinfo) | Information to aid in pagination. |
+
+#### `CiVariableEdge`
+
+The edge type for [`CiVariable`](#civariable).
+
+##### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="civariableedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. |
+| <a id="civariableedgenode"></a>`node` | [`CiVariable`](#civariable) | The item at the end of the edge. |
+
 #### `ClusterAgentActivityEventConnection`
 The connection type for [`ClusterAgentActivityEvent`](#clusteragentactivityevent).
@@ -9992,6 +10025,20 @@ GitLab CI/CD configuration template.
 | <a id="citemplatecontent"></a>`content` | [`String!`](#string) | Contents of the CI template. |
 | <a id="citemplatename"></a>`name` | [`String!`](#string) | Name of the CI template. |
+### `CiVariable`
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="civariableid"></a>`id` | [`ID!`](#id) | ID of the variable. |
+| <a id="civariablekey"></a>`key` | [`String`](#string) | Name of the variable. |
+| <a id="civariablemasked"></a>`masked` | [`Boolean`](#boolean) | Indicates whether the variable is masked. |
+| <a id="civariableprotected"></a>`protected` | [`Boolean`](#boolean) | Indicates whether the variable is protected. |
+| <a id="civariableraw"></a>`raw` | [`Boolean`](#boolean) | Indicates whether the variable is raw. |
+| <a id="civariablevalue"></a>`value` | [`String`](#string) | Value of the variable. |
+| <a id="civariablevariabletype"></a>`variableType` | [`CiVariableType`](#civariabletype) | Type of the variable. |
+
 ### `ClusterAgent`
 #### Fields
@@ -11747,6 +11794,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="groupallowstalerunnerpruning"></a>`allowStaleRunnerPruning` | [`Boolean!`](#boolean) | Indicates whether to regularly prune stale group runners. Defaults to false. |
 | <a id="groupautodevopsenabled"></a>`autoDevopsEnabled` | [`Boolean`](#boolean) | Indicates whether Auto DevOps is enabled for all projects within this group. |
 | <a id="groupavatarurl"></a>`avatarUrl` | [`String`](#string) | Avatar URL of the group. |
+| <a id="groupcivariables"></a>`ciVariables` | [`CiVariableConnection`](#civariableconnection) | List of the group's CI/CD variables. (see [Connections](#connections)) |
 | <a id="groupclusteragents"></a>`clusterAgents` | [`ClusterAgentConnection`](#clusteragentconnection) | Cluster agents associated with projects in the group and its subgroups. (see [Connections](#connections)) |
 | <a id="groupcontainerrepositoriescount"></a>`containerRepositoriesCount` | [`Int!`](#int) | Number of container repositories in the group. |
 | <a id="groupcontainslockedprojects"></a>`containsLockedProjects` | [`Boolean!`](#boolean) | Includes at least one project where the repository size exceeds the limit. |
@@ -15004,6 +15052,7 @@ Represents vulnerability finding of a security report on the pipeline.
 | <a id="projectcicdsettings"></a>`ciCdSettings` | [`ProjectCiCdSetting`](#projectcicdsetting) | CI/CD settings for the project. |
 | <a id="projectciconfigpathordefault"></a>`ciConfigPathOrDefault` | [`String!`](#string) | Path of the CI configuration file. |
 | <a id="projectcijobtokenscope"></a>`ciJobTokenScope` | [`CiJobTokenScopeType`](#cijobtokenscopetype) | The CI Job Tokens scope of access. |
+| <a id="projectcivariables"></a>`ciVariables` | [`CiVariableConnection`](#civariableconnection) | List of the project's CI/CD variables. (see [Connections](#connections)) |
 | <a id="projectclusteragents"></a>`clusterAgents` | [`ClusterAgentConnection`](#clusteragentconnection) | Cluster agents associated with the project. (see [Connections](#connections)) |
 | <a id="projectcodecoveragesummary"></a>`codeCoverageSummary` | [`CodeCoverageSummary`](#codecoveragesummary) | Code coverage summary associated with the project. |
 | <a id="projectcomplianceframeworks"></a>`complianceFrameworks` | [`ComplianceFrameworkConnection`](#complianceframeworkconnection) | Compliance frameworks associated with the project. (see [Connections](#connections)) |
@@ -18366,6 +18415,18 @@ Check permissions for the current user on a work item.
 | <a id="workitemtypeid"></a>`id` | [`WorkItemsTypeID!`](#workitemstypeid) | Global ID of the work item type. |
 | <a id="workitemtypename"></a>`name` | [`String!`](#string) | Name of the work item type. |
+### `WorkItemWidgetAssignees`
+
+Represents an assignees widget.
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="workitemwidgetassigneesallowsmultipleassignees"></a>`allowsMultipleAssignees` | [`Boolean`](#boolean) | Indicates whether multiple assignees are allowed. |
+| <a id="workitemwidgetassigneesassignees"></a>`assignees` | [`UserCoreConnection`](#usercoreconnection) | Assignees of the work item. (see [Connections](#connections)) |
+| <a id="workitemwidgetassigneestype"></a>`type` | [`WorkItemWidgetType`](#workitemwidgettype) | Widget type. |
+
 ### `WorkItemWidgetDescription`
 Represents a description widget.
@@ -18661,6 +18722,13 @@ Values for sorting runners.
 | <a id="cirunnerupgradestatustyperecommended"></a>`RECOMMENDED` | Upgrade is available and recommended for the runner. |
 | <a id="cirunnerupgradestatustypeunknown"></a>`UNKNOWN` | Upgrade status is unknown. |
+### `CiVariableType`
+
+| Value | Description |
+| ----- | ----------- |
+| <a id="civariabletypeenv_var"></a>`ENV_VAR` | Env var type. |
+| <a id="civariabletypefile"></a>`FILE` | File type. |
+
 ### `CodeQualityDegradationSeverity`
 | Value | Description |
@@ -20234,6 +20302,7 @@ Type of a work item widget.
 | Value | Description |
 | ----- | ----------- |
+| <a id="workitemwidgettypeassignees"></a>`ASSIGNEES` | Assignees widget. |
 | <a id="workitemwidgettypedescription"></a>`DESCRIPTION` | Description widget. |
 | <a id="workitemwidgettypehierarchy"></a>`HIERARCHY` | Hierarchy widget. |
@@ -21454,6 +21523,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
 Implementations:
+- [`WorkItemWidgetAssignees`](#workitemwidgetassignees)
 - [`WorkItemWidgetDescription`](#workitemwidgetdescription)
 - [`WorkItemWidgetHierarchy`](#workitemwidgethierarchy)

ee/app/services/vulnerabilities/confirm_service.rb

@@ -7,8 +7,14 @@ class ConfirmService < BaseService
     def execute
       raise Gitlab::Access::AccessDeniedError unless authorized?
 
-      update_vulnerability_with(state: Vulnerability.states[:confirmed], confirmed_by: @user, confirmed_at: Time.current) do
-        DestroyDismissalFeedbackService.new(@user, @vulnerability).execute
+      if Feature.enabled?(:deprecate_vulnerabilities_feedback, @vulnerability.project)
+        update_vulnerability_with(state: Vulnerability.states[:confirmed], confirmed_by: @user,
+                                  confirmed_at: Time.current)
+      else
+        update_vulnerability_with(state: Vulnerability.states[:confirmed], confirmed_by: @user,
+                                  confirmed_at: Time.current) do
+          DestroyDismissalFeedbackService.new(@user, @vulnerability).execute
+        end
       end
 
       @vulnerability