.rubocop_todo/style/explicit_block_argument.yml

@@ -100,7 +100,6 @@ Style/ExplicitBlockArgument:
     - 'spec/services/pages/zip_directory_service_spec.rb'
     - 'spec/services/todo_service_spec.rb'
     - 'spec/support/helpers/feature_flag_helpers.rb'
-    - 'spec/support/helpers/features/runner_helpers.rb'
     - 'spec/support/helpers/features/top_nav_spec_helpers.rb'
     - 'spec/support/helpers/graphql_helpers.rb'
     - 'spec/support/helpers/modal_helpers.rb'

Gemfile

@@ -408,7 +408,7 @@ group :development, :test do
 end
 
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 3.4.3', require: false
+  gem 'gitlab-dangerfiles', '~> 3.5.0', require: false
 end
 
 group :development, :test, :coverage do

Gemfile.lock

@@ -405,8 +405,8 @@ GEM
     faraday-http-cache (2.4.0)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -499,7 +499,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    git (1.7.0)
+    git (1.11.0)
       rchardet (~> 1.8)
     gitaly (15.1.0.pre.rc1)
       grpc (~> 1.0)
@@ -509,7 +509,7 @@ GEM
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-dangerfiles (3.4.3)
+    gitlab-dangerfiles (3.5.0)
       danger (>= 8.4.5)
       danger-gitlab (>= 8.0.0)
       rake
@@ -794,9 +794,9 @@ GEM
     memoist (0.16.2)
     memory_profiler (0.9.14)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2022.0105)
     mini_histogram (0.3.1)
     mini_magick (4.10.1)
     mini_mime (1.1.2)
@@ -820,7 +820,7 @@ GEM
     msgpack (1.5.2)
     multi_json (1.14.1)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     murmurhash3 (0.1.6)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -853,9 +853,9 @@ GEM
       rack (>= 1.2, < 3)
       rash_alt (>= 0.4, < 1)
       version_gem (~> 1.0)
-    octokit (4.20.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     ohai (16.10.6)
       chef-config (>= 12.8, < 17)
       chef-utils (>= 16.0, < 17)
@@ -1224,9 +1224,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     sd_notify (0.1.0)
     securecompare (1.0.0)
     seed-fu (2.3.7)
@@ -1564,7 +1564,7 @@ DEPENDENCIES
   gitaly (~> 15.1.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 3.4.3)
+  gitlab-dangerfiles (~> 3.5.0)
   gitlab-experiment (~> 0.7.1)
   gitlab-fog-azure-rm (~> 1.3.0)
   gitlab-labkit (~> 0.23.0)

app/assets/javascripts/editor/components/source_editor_toolbar_button.vue

@@ -52,6 +52,7 @@ export default {
     :icon="icon"
     :title="label"
     :aria-label="label"
+    data-qa-selector="editor_toolbar_button"
     @click="clickHandler"
   />
 </template>

app/models/project.rb

@@ -3018,6 +3018,10 @@ def security_training_available?
     licensed_feature_available?(:security_training)
   end
 
+  def destroy_deployment_by_id(deployment_id)
+    deployments.where(id: deployment_id).fast_destroy_all
+  end
+
   private
 
   # overridden in EE

app/policies/deployment_policy.rb

@@ -24,3 +24,5 @@ class DeploymentPolicy < BasePolicy
     prevent :update_deployment
   end
 end
+
+DeploymentPolicy.prepend_mod_with('DeploymentPolicy')

app/policies/project_policy.rb

@@ -470,6 +470,7 @@ class ProjectPolicy < BasePolicy
     enable :admin_pipeline
     enable :admin_environment
     enable :admin_deployment
+    enable :destroy_deployment
     enable :admin_pages
     enable :read_pages
     enable :update_pages

app/services/ci/deployments/destroy_service.rb

+# frozen_string_literal: true
+
+module Ci
+  module Deployments
+    class DestroyService < BaseService
+      def execute(deployment)
+        raise Gitlab::Access::AccessDeniedError unless can?(current_user, :destroy_deployment, deployment)
+
+        return ServiceResponse.error(message: 'Cannot destroy running deployment') if deployment&.running?
+        return ServiceResponse.error(message: 'Deployment currently deployed to environment') if deployment&.last?
+
+        project.destroy_deployment_by_id(deployment)
+
+        ServiceResponse.success(message: 'Deployment destroyed')
+      end
+    end
+  end
+end

app/views/projects/blob/_editor.html.haml

@@ -42,7 +42,7 @@
   .file-editor.code
     - if Feature.enabled?(:source_editor_toolbar, current_user)
       #editor-toolbar
-    .js-edit-mode-pane.qa-editor#editor{ data: { 'editor-loading': true } }<
+    .js-edit-mode-pane.qa-editor#editor{ data: { 'editor-loading': true, qa_selector: 'source_editor_preview_container' } }<
       %pre.editor-loading-content= params[:content] || local_assigns[:blob_data]
     - if local_assigns[:path]
       .js-edit-mode-pane#preview.hide

config/feature_flags/development/delete_deployments_api.yml

+---
+name: delete_deployments_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92378
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367885
+milestone: '15.3'
+type: development
+group: group::release
+default_enabled: false

doc/api/deployments.md

@@ -458,6 +458,37 @@ Deployments created by users on GitLab Premium or higher include the `approvals`
 }
 ```
 
+## Delete a specific deployment
+
+Delete a specific deployment that is not currently the last deployment for an environment or in a `running` state
+
+```plaintext
+DELETE /projects/:id/deployments/:deployment_id
+```
+
+| Attribute | Type    | Required | Description         |
+|-----------|---------|----------|---------------------|
+| `id`      | integer/string | yes      | The ID or [URL-encoded path of the project](index.md#namespaced-path-encoding) owned by the authenticated user |
+| `deployment_id` | integer | yes      | The ID of the deployment |
+
+```shell
+curl --request "DELETE" --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/1/deployments/1"
+```
+
+Example responses:
+
+```json
+{ "message": "202 Accepted" }
+```
+
+```json
+{ "message": "400 Cannot destroy running deployment" }
+```
+
+```json
+{ "message": "400 Deployment currently deployed to environment" }
+```
+
 ## List of merge requests associated with a deployment
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/35739) in GitLab 12.7.

doc/integration/saml.md

@@ -907,7 +907,7 @@ the SAML request, but in GitLab 11.7 and earlier this error never reaches GitLab
 the CSRF check.
 
 To bypass this you can add `skip_before_action :verify_authenticity_token` to the
-`omniauth_callbacks_controller.rb` file immediately after the `class` line and
+`omniauth_callbacks_controller.rb` file immediately before the `after_action :verify_known_sign_in` line and
 comment out the `protect_from_forgery` line using a `#`. Restart Puma for this
 change to take effect. This allows the error to hit GitLab, where it can then
 be seen in the usual logs, or as a flash message on the login screen.

ee/app/models/ee/epic.rb

@@ -225,7 +225,7 @@ def set_fixed_due_date
       end
 
       def usage_ping_record_epic_creation
-        ::Gitlab::UsageDataCounters::EpicActivityUniqueCounter.track_epic_created_action(author: author)
+        ::Gitlab::UsageDataCounters::EpicActivityUniqueCounter.track_epic_created_action(author: author, namespace: group)
       end
     end
 

ee/app/policies/ee/deployment_policy.rb

+# frozen_string_literal: true
+
+module EE
+  module DeploymentPolicy
+    extend ActiveSupport::Concern
+
+    prepended do
+      condition(:protected_environment) do
+        @subject.environment.protected_from?(user)
+      end
+
+      rule { protected_environment }.policy do
+        prevent :destroy_deployment
+      end
+    end
+  end
+end

ee/app/services/epics/update_service.rb

@@ -159,11 +159,11 @@ def saved_change_to_epic_dates?(epic)
 
     def track_changes(epic)
       if epic.saved_change_to_attribute?(:title)
-        ::Gitlab::UsageDataCounters::EpicActivityUniqueCounter.track_epic_title_changed_action(author: current_user)
+        ::Gitlab::UsageDataCounters::EpicActivityUniqueCounter.track_epic_title_changed_action(author: current_user, namespace: epic.group)
       end
 
       if epic.saved_change_to_attribute?(:description)
-        ::Gitlab::UsageDataCounters::EpicActivityUniqueCounter.track_epic_description_changed_action(author: current_user)
+        ::Gitlab::UsageDataCounters::EpicActivityUniqueCounter.track_epic_description_changed_action(author: current_user, namespace: epic.group)
         track_task_changes(epic)
       end
     end

ee/config/events/1657117296_epics_action_perform_epics_action.yml

+---
+description: Epic usage event
+category: epics_action
+action: perform_epics_action
+label_description:
+property_description: the name of the performed action
+value_description:
+extra_properties:
+identifiers:
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: product_planning
+product_category: epics
+milestone: "15.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91912
+distributions:
+- ee
+tiers:
+- premium
+- ultimate
+

ee/lib/gitlab/usage_data_counters/epic_activity_unique_counter.rb

@@ -7,9 +7,13 @@ module EpicActivityUniqueCounter
       # on epic event names, because they are persisted at the same
       # slot of issue events to allow data aggregation.
       # More information in: https://gitlab.com/gitlab-org/gitlab/-/issues/322405
+      EPIC_CATEGORY = 'epics_action'
+      EPIC_ACTION = 'perform_epics_action'
+      EPIC_LABEL = 'redis_hll_counters.epics_usage.epics_usage_total_unique_counts_monthly'
+
       EPIC_CREATED = 'g_project_management_epic_created'
-      EPIC_TITLE_CHANGED = 'g_project_management_users_updating_epic_titles'
       EPIC_DESCRIPTION_CHANGED = 'g_project_management_users_updating_epic_descriptions'
+      EPIC_TITLE_CHANGED = 'g_project_management_users_updating_epic_titles'
       EPIC_NOTE_CREATED = 'g_project_management_users_creating_epic_notes'
       EPIC_NOTE_UPDATED = 'g_project_management_users_updating_epic_notes'
       EPIC_NOTE_DESTROYED = 'g_project_management_users_destroying_epic_notes'
@@ -43,15 +47,18 @@ module EpicActivityUniqueCounter
       EPIC_BLOCKED_REMOVED = 'g_project_management_epic_blocked_removed'
 
       class << self
-        def track_epic_created_action(author:)
+        def track_epic_created_action(author:, namespace:)
+          track_snowplow_action(EPIC_CREATED, author, namespace)
           track_unique_action(EPIC_CREATED, author)
         end
 
-        def track_epic_title_changed_action(author:)
+        def track_epic_title_changed_action(author:, namespace:)
+          track_snowplow_action(EPIC_TITLE_CHANGED, author, namespace)
           track_unique_action(EPIC_TITLE_CHANGED, author)
         end
 
-        def track_epic_description_changed_action(author:)
+        def track_epic_description_changed_action(author:, namespace:)
+          track_snowplow_action(EPIC_DESCRIPTION_CHANGED, author, namespace)
           track_unique_action(EPIC_DESCRIPTION_CHANGED, author)
         end
 
@@ -187,6 +194,20 @@ def track_unique_action(action, author)
 
           Gitlab::UsageDataCounters::HLLRedisCounter.track_event(action, values: author.id)
         end
+
+        def track_snowplow_action(action, author, namespace)
+          return unless Feature.enabled?(:route_hll_to_snowplow_phase2, namespace)
+          return unless author
+
+          Gitlab::Tracking.event(
+            EPIC_CATEGORY,
+            EPIC_ACTION,
+            label: EPIC_LABEL,
+            property: action,
+            namespace: namespace,
+            user: author
+          )
+        end
       end
     end
   end

ee/spec/factories/protected_environments.rb

@@ -23,6 +23,12 @@
       end
     end
 
+    trait :admins_can_deploy do
+      after(:build) do |protected_environment|
+        protected_environment.deploy_access_levels.new(access_level: Gitlab::Access::ADMIN)
+      end
+    end
+
     trait :maintainers_can_deploy do
       after(:build) do |protected_environment|
         protected_environment.deploy_access_levels.new(access_level: Gitlab::Access::MAINTAINER)

ee/spec/lib/ee/gitlab/usage_data_counters/issue_activity_unique_counter_spec.rb

@@ -9,7 +9,7 @@
 
   context 'for Issue health status changed actions' do
     it_behaves_like 'a daily tracked issuable snowplow and service ping events' do
-      let(:action) { described_class::ISSUE_HEALTH_STATUS_CHANGED }
+      let_it_be(:action) { described_class::ISSUE_HEALTH_STATUS_CHANGED }
 
       def track_action(params)
         described_class.track_issue_health_status_changed_action(**params)
@@ -19,7 +19,7 @@ def track_action(params)
 
   context 'for Issue iteration changed actions' do
     it_behaves_like 'a daily tracked issuable snowplow and service ping events' do
-      let(:action) { described_class::ISSUE_ITERATION_CHANGED }
+      let_it_be(:action) { described_class::ISSUE_ITERATION_CHANGED }
 
       def track_action(params)
         described_class.track_issue_iteration_changed_action(**params)
@@ -29,7 +29,7 @@ def track_action(params)
 
   context 'for Issue weight changed actions' do
     it_behaves_like 'a daily tracked issuable snowplow and service ping events' do
-      let(:action) { described_class::ISSUE_WEIGHT_CHANGED }
+      let_it_be(:action) { described_class::ISSUE_WEIGHT_CHANGED }
 
       def track_action(params)
         described_class.track_issue_weight_changed_action(**params)
@@ -39,7 +39,7 @@ def track_action(params)
 
   context 'for Issue added to epic actions' do
     it_behaves_like 'a daily tracked issuable snowplow and service ping events' do
-      let(:action) { described_class::ISSUE_ADDED_TO_EPIC}
+      let_it_be(:action) { described_class::ISSUE_ADDED_TO_EPIC}
 
       def track_action(params)
         described_class.track_issue_added_to_epic_action(**params)
@@ -49,7 +49,7 @@ def track_action(params)
 
   context 'for Issue removed from epic actions' do
     it_behaves_like 'a daily tracked issuable snowplow and service ping events' do
-      let(:action) { described_class::ISSUE_REMOVED_FROM_EPIC}
+      let_it_be(:action) { described_class::ISSUE_REMOVED_FROM_EPIC}
 
       def track_action(params)
         described_class.track_issue_removed_from_epic_action(**params)
@@ -59,7 +59,7 @@ def track_action(params)
 
   context 'for Issue changed epic actions' do
     it_behaves_like 'a daily tracked issuable snowplow and service ping events' do
-      let(:action) { described_class::ISSUE_CHANGED_EPIC}
+      let_it_be(:action) { described_class::ISSUE_CHANGED_EPIC}
 
       def track_action(params)
         described_class.track_issue_changed_epic_action(**params)

ee/spec/lib/gitlab/usage_data_counters/epic_activity_unique_counter_spec.rb

@@ -2,20 +2,26 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::UsageDataCounters::EpicActivityUniqueCounter, :clean_gitlab_redis_shared_state do
+RSpec.describe Gitlab::UsageDataCounters::EpicActivityUniqueCounter, :snowplow, :clean_gitlab_redis_shared_state do
   let_it_be(:user1) { build(:user, id: 1) }
   let_it_be(:user2) { build(:user, id: 2) }
+  let_it_be(:namespace) { build(:group) }
+  let_it_be(:category) { described_class::EPIC_CATEGORY }
+  let_it_be(:event_action) { described_class::EPIC_ACTION }
+  let_it_be(:event_label) { described_class::EPIC_LABEL }
+
+  let(:event_property) { action }
 
   context 'for epic created event' do
     def track_action(params)
       described_class.track_epic_created_action(**params)
     end
 
-    it_behaves_like 'a daily tracked issuable event' do
+    it_behaves_like 'a daily tracked issuable snowplow and service ping events with namespace' do
       let(:action) { described_class::EPIC_CREATED }
     end
 
-    it_behaves_like 'does not track when feature flag is disabled', :track_epics_activity
+    it_behaves_like 'does not track with namespace when feature flag is disabled', :track_epics_activity
   end
 
   context 'for epic title changed event' do
@@ -23,11 +29,11 @@ def track_action(params)
       described_class.track_epic_title_changed_action(**params)
     end
 
-    it_behaves_like 'a daily tracked issuable event' do
+    it_behaves_like 'a daily tracked issuable snowplow and service ping events with namespace' do
       let(:action) { described_class::EPIC_TITLE_CHANGED }
     end
 
-    it_behaves_like 'does not track when feature flag is disabled', :track_epics_activity
+    it_behaves_like 'does not track with namespace when feature flag is disabled', :track_epics_activity
   end
 
   context 'for epic description changed event' do
@@ -35,11 +41,11 @@ def track_action(params)
       described_class.track_epic_description_changed_action(**params)
     end
 
-    it_behaves_like 'a daily tracked issuable event' do
+    it_behaves_like 'a daily tracked issuable snowplow and service ping events with namespace' do
       let(:action) { described_class::EPIC_DESCRIPTION_CHANGED }
     end
 
-    it_behaves_like 'does not track when feature flag is disabled', :track_epics_activity
+    it_behaves_like 'does not track with namespace when feature flag is disabled', :track_epics_activity
   end
 
   context 'for epic note created event' do