Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/lib/utils/common_utils.js

@@ -483,6 +483,16 @@ export const historyPushState = newUrl => {
   window.history.pushState({}, document.title, newUrl);
 };
+/**
+ * Based on the current location and the string parameters provided
+ * overwrites the current entry in the history without reloading the page.
+ *
+ * @param {String} param
+ */
+export const historyReplaceState = newUrl => {
+  window.history.replaceState({}, document.title, newUrl);
+};
+
 /**
  * Returns true for a String value of "true" and false otherwise.
  * This is the opposite of Boolean(...).toString().

app/assets/javascripts/pages/projects/pipelines/index/index.js

 import Vue from 'vue';
+import { GlToast } from '@gitlab/ui';
+import { doesHashExistInUrl } from '~/lib/utils/url_utility';
+import {
+  parseBoolean,
+  historyReplaceState,
+  buildUrlWithCurrentLocation,
+} from '~/lib/utils/common_utils';
+import { __ } from '~/locale';
 import PipelinesStore from '../../../../pipelines/stores/pipelines_store';
 import pipelinesComponent from '../../../../pipelines/components/pipelines.vue';
 import Translate from '../../../../vue_shared/translate';
-import { parseBoolean } from '../../../../lib/utils/common_utils';
 Vue.use(Translate);
+Vue.use(GlToast);
 document.addEventListener(
   'DOMContentLoaded',
@@ -21,6 +29,11 @@ document.addEventListener(
       },
       created() {
         this.dataset = document.querySelector(this.$options.el).dataset;
+
+        if (doesHashExistInUrl('delete_success')) {
+          this.$toast.show(__('The pipeline has been deleted'));
+          historyReplaceState(buildUrlWithCurrentLocation());
+        }
       },
       render(createElement) {
         return createElement('pipelines-component', {

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

 <script>
-import { GlLoadingIcon } from '@gitlab/ui';
+import { GlLoadingIcon, GlModal } from '@gitlab/ui';
 import ciHeader from '../../vue_shared/components/header_ci_component.vue';
 import eventHub from '../event_hub';
 import { __ } from '~/locale';
+const DELETE_MODAL_ID = 'pipeline-delete-modal';
+
 export default {
   name: 'PipelineHeaderSection',
   components: {
     ciHeader,
     GlLoadingIcon,
+    GlModal,
   },
   props: {
     pipeline: {
@@ -33,6 +36,11 @@ export default {
     shouldRenderContent() {
       return !this.isLoading && Object.keys(this.pipeline).length;
     },
+    deleteModalConfirmationText() {
+      return __(
+        'Are you sure you want to delete this pipeline? Doing so will expire all pipeline caches and delete all related objects, such as builds, logs, artifacts, and triggers. This action cannot be undone.',
+      );
+    },
   },
   watch: {
@@ -42,6 +50,13 @@ export default {
   },
   methods: {
+    onActionClicked(action) {
+      if (action.modal) {
+        this.$root.$emit('bv::show::modal', action.modal);
+      } else {
+        this.postAction(action);
+      }
+    },
     postAction(action) {
       const index = this.actions.indexOf(action);
@@ -49,6 +64,13 @@ export default {
       eventHub.$emit('headerPostAction', action);
     },
+    deletePipeline() {
+      const index = this.actions.findIndex(action => action.modal === DELETE_MODAL_ID);
+
+      this.$set(this.actions[index], 'isLoading', true);
+
+      eventHub.$emit('headerDeleteAction', this.actions[index]);
+    },
     getActions() {
       const actions = [];
@@ -58,7 +80,6 @@ export default {
           label: __('Retry'),
           path: this.pipeline.retry_path,
           cssClass: 'js-retry-button btn btn-inverted-secondary',
-          type: 'button',
           isLoading: false,
         });
       }
@@ -68,7 +89,16 @@ export default {
           label: __('Cancel running'),
           path: this.pipeline.cancel_path,
           cssClass: 'js-btn-cancel-pipeline btn btn-danger',
-          type: 'button',
+          isLoading: false,
+        });
+      }
+
+      if (this.pipeline.delete_path) {
+        actions.push({
+          label: __('Delete'),
+          path: this.pipeline.delete_path,
+          modal: DELETE_MODAL_ID,
+          cssClass: 'js-btn-delete-pipeline btn btn-danger btn-inverted',
           isLoading: false,
         });
       }
@@ -76,6 +106,7 @@ export default {
       return actions;
     },
   },
+  DELETE_MODAL_ID,
 };
 </script>
 <template>
@@ -88,8 +119,21 @@ export default {
       :user="pipeline.user"
       :actions="actions"
       item-name="Pipeline"
-      @actionClicked="postAction"
+      @actionClicked="onActionClicked"
     />
+
     <gl-loading-icon v-if="isLoading" :size="2" class="prepend-top-default append-bottom-default" />
+
+    <gl-modal
+      :modal-id="$options.DELETE_MODAL_ID"
+      :title="__('Delete pipeline')"
+      :ok-title="__('Delete pipeline')"
+      ok-variant="danger"
+      @ok="deletePipeline()"
+    >
+      <p>
+        {{ deleteModalConfirmationText }}
+      </p>
+    </gl-modal>
   </div>
 </template>

app/assets/javascripts/pipelines/pipeline_details_bundle.js

@@ -2,6 +2,7 @@ import Vue from 'vue';
 import Flash from '~/flash';
 import Translate from '~/vue_shared/translate';
 import { __ } from '~/locale';
+import { setUrlFragment, redirectTo } from '~/lib/utils/url_utility';
 import pipelineGraph from './components/graph/graph_component.vue';
 import GraphBundleMixin from './mixins/graph_pipeline_bundle_mixin';
 import PipelinesMediator from './pipeline_details_mediator';
@@ -62,9 +63,11 @@ export default () => {
     },
     created() {
       eventHub.$on('headerPostAction', this.postAction);
+      eventHub.$on('headerDeleteAction', this.deleteAction);
     },
     beforeDestroy() {
       eventHub.$off('headerPostAction', this.postAction);
+      eventHub.$off('headerDeleteAction', this.deleteAction);
     },
     methods: {
       postAction(action) {
@@ -73,6 +76,13 @@ export default () => {
           .then(() => this.mediator.refreshPipeline())
           .catch(() => Flash(__('An error occurred while making the request.')));
       },
+      deleteAction(action) {
+        this.mediator.stopPipelinePoll();
+        this.mediator.service
+          .deleteAction(action.path)
+          .then(({ request }) => redirectTo(setUrlFragment(request.responseURL, 'delete_success')))
+          .catch(() => Flash(__('An error occurred while deleting the pipeline.')));
+      },
     },
     render(createElement) {
       return createElement('pipeline-header', {

app/assets/javascripts/pipelines/pipeline_details_mediator.js

@@ -35,7 +35,7 @@ export default class pipelinesMediator {
       if (!Visibility.hidden()) {
         this.poll.restart();
       } else {
-        this.poll.stop();
+        this.stopPipelinePoll();
       }
     });
   }
@@ -51,7 +51,7 @@ export default class pipelinesMediator {
   }
   refreshPipeline() {
-    this.poll.stop();
+    this.stopPipelinePoll();
     return this.service
       .getPipeline()
@@ -64,6 +64,10 @@ export default class pipelinesMediator {
       );
   }
+  stopPipelinePoll() {
+    this.poll.stop();
+  }
+
   /**
    * Backend expects paramets in the following format: `expanded[]=id&expanded[]=id`
    */

app/assets/javascripts/pipelines/services/pipeline_service.js

@@ -9,6 +9,11 @@ export default class PipelineService {
     return axios.get(this.pipeline, { params });
   }
+  // eslint-disable-next-line class-methods-use-this
+  deleteAction(endpoint) {
+    return axios.delete(`${endpoint}.json`);
+  }
+
   // eslint-disable-next-line class-methods-use-this
   postAction(endpoint) {
     return axios.post(`${endpoint}.json`);

app/assets/javascripts/vue_shared/components/header_ci_component.vue

@@ -117,28 +117,7 @@ export default {
     <section v-if="actions.length" class="header-action-buttons">
       <template v-for="(action, i) in actions">
-        <gl-link
-          v-if="action.type === 'link'"
-          :key="i"
-          :href="action.path"
-          :class="action.cssClass"
-        >
-          {{ action.label }}
-        </gl-link>
-
-        <gl-link
-          v-else-if="action.type === 'ujs-link'"
-          :key="i"
-          :href="action.path"
-          :class="action.cssClass"
-          data-method="post"
-          rel="nofollow"
-        >
-          {{ action.label }}
-        </gl-link>
-
         <loading-button
-          v-else-if="action.type === 'button'"
           :key="i"
           :loading="action.isLoading"
           :disabled="action.isLoading"

app/controllers/projects/pipelines_controller.rb

@@ -80,6 +80,12 @@ class Projects::PipelinesController < Projects::ApplicationController
     end
   end
+  def destroy
+    ::Ci::DestroyPipelineService.new(project, current_user).execute(pipeline)
+
+    redirect_to project_pipelines_path(project), status: :see_other
+  end
+
   def builds
     render_show
   end

app/finders/pipelines_finder.rb

@@ -17,7 +17,7 @@ class PipelinesFinder
       return Ci::Pipeline.none
     end
-    items = pipelines.no_child
+    items = pipelines
     items = by_scope(items)
     items = by_status(items)
     items = by_ref(items)

app/models/ci/bridge.rb

@@ -54,10 +54,6 @@ module Ci
     def to_partial_path
       'projects/generic_commit_statuses/generic_commit_status'
     end
-
-    def yaml_for_downstream
-      nil
-    end
   end
 end

app/models/ci/pipeline.rb

@@ -61,9 +61,7 @@ module Ci
     has_one :chat_data, class_name: 'Ci::PipelineChatData'
     has_many :triggered_pipelines, through: :sourced_pipelines, source: :pipeline
-    has_many :child_pipelines, -> { merge(Ci::Sources::Pipeline.same_project) }, through: :sourced_pipelines, source: :pipeline
     has_one :triggered_by_pipeline, through: :source_pipeline, source: :source_pipeline
-    has_one :parent_pipeline, -> { merge(Ci::Sources::Pipeline.same_project) }, through: :source_pipeline, source: :source_pipeline
     has_one :source_job, through: :source_pipeline, source: :source_job
     has_one :pipeline_config, class_name: 'Ci::PipelineConfig', inverse_of: :pipeline
@@ -215,7 +213,6 @@ module Ci
     end
     scope :internal, -> { where(source: internal_sources) }
-    scope :no_child, -> { where.not(source: :parent_pipeline) }
     scope :ci_sources, -> { where(config_source: ::Ci::PipelineEnums.ci_config_sources_values) }
     scope :for_user, -> (user) { where(user: user) }
     scope :for_sha, -> (sha) { where(sha: sha) }
@@ -511,6 +508,10 @@ module Ci
       builds.skipped.after_stage(stage_idx).find_each(&:process)
     end
+    def child?
+      false
+    end
+
     def latest?
       return false unless git_ref && commit.present?
@@ -693,24 +694,6 @@ module Ci
       all_merge_requests.order(id: :desc)
     end
-    # If pipeline is a child of another pipeline, include the parent
-    # and the siblings, otherwise return only itself.
-    def same_family_pipeline_ids
-      if (parent = parent_pipeline)
-        [parent.id] + parent.child_pipelines.pluck(:id)
-      else
-        [self.id]
-      end
-    end
-
-    def child?
-      parent_pipeline.present?
-    end
-
-    def parent?
-      child_pipelines.exists?
-    end
-
     def detailed_status(current_user)
       Gitlab::Ci::Status::Pipeline::Factory
         .new(self, current_user)

app/models/ci/pipeline_enums.rb

@@ -23,11 +23,10 @@ module Ci
         schedule: 4,
         api: 5,
         external: 6,
-        cross_project_pipeline: 7,
+        pipeline: 7,
         chat: 8,
         merge_request_event: 10,
-        external_pull_request_event: 11,
-        parent_pipeline: 12
+        external_pull_request_event: 11
       }
     end
@@ -39,8 +38,7 @@ module Ci
         repository_source: 1,
         auto_devops_source: 2,
         remote_source: 4,
-        external_project_source: 5,
-        bridge_source: 6
+        external_project_source: 5
       }
     end

app/models/ci/sources/pipeline.rb

@@ -18,8 +18,6 @@ module Ci
       validates :source_project, presence: true
       validates :source_job, presence: true
       validates :source_pipeline, presence: true
-
-      scope :same_project, -> { where(arel_table[:source_project_id].eq(arel_table[:project_id])) }
     end
   end
 end

app/serializers/pipeline_details_entity.rb

 # frozen_string_literal: true
 class PipelineDetailsEntity < PipelineEntity
-  expose :project, using: ProjectEntity
-
   expose :flags do
     expose :latest?, as: :latest
   end

app/serializers/pipeline_entity.rb

@@ -77,6 +77,10 @@ class PipelineEntity < Grape::Entity
     cancel_project_pipeline_path(pipeline.project, pipeline)
   end
+  expose :delete_path, if: -> (*) { can_delete? } do |pipeline|
+    project_pipeline_path(pipeline.project, pipeline)
+  end
+
   expose :failed_builds, if: -> (*) { can_retry? }, using: JobEntity do |pipeline|
     pipeline.failed_builds
   end
@@ -95,6 +99,10 @@ class PipelineEntity < Grape::Entity
       pipeline.cancelable?
   end
+  def can_delete?
+    can?(request.current_user, :destroy_pipeline, pipeline)
+  end
+
   def has_presentable_merge_request?
     pipeline.triggered_by_merge_request? &&
       can?(request.current_user, :read_merge_request, pipeline.merge_request)

app/serializers/pipeline_serializer.rb

@@ -41,7 +41,6 @@ class PipelineSerializer < BaseSerializer
   def preloaded_relations
     [
       :latest_statuses_ordered_by_stage,
-      :project,
       :stages,
       {
         failed_builds: %i(project metadata)

app/services/ci/create_pipeline_service.rb

@@ -23,7 +23,7 @@ module Ci
                 Gitlab::Ci::Pipeline::Chain::Limit::JobActivity].freeze
     # rubocop: disable Metrics/ParameterLists
-    def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, merge_request: nil, external_pull_request: nil, bridge: nil, **options, &block)
+    def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, merge_request: nil, external_pull_request: nil, **options, &block)
       @pipeline = Ci::Pipeline.new
       command = Gitlab::Ci::Pipeline::Chain::Command.new(
@@ -46,7 +46,6 @@ module Ci
         current_user: current_user,
         push_options: params[:push_options] || {},
         chat_data: params[:chat_data],
-        bridge: bridge,
         **extra_options(options))
       sequence = Gitlab::Ci::Pipeline::Chain::Sequence
@@ -105,14 +104,14 @@ module Ci
       if Feature.enabled?(:ci_support_interruptible_pipelines, project, default_enabled: true)
         project.ci_pipelines
           .where(ref: pipeline.ref)
-          .where.not(id: pipeline.same_family_pipeline_ids)
+          .where.not(id: pipeline.id)
           .where.not(sha: project.commit(pipeline.ref).try(:id))
           .alive_or_scheduled
           .with_only_interruptible_builds
       else
         project.ci_pipelines
           .where(ref: pipeline.ref)
-          .where.not(id: pipeline.same_family_pipeline_ids)
+          .where.not(id: pipeline.id)
           .where.not(sha: project.commit(pipeline.ref).try(:id))
           .created_or_pending
       end

app/services/ci/pipeline_trigger_service.rb

@@ -44,7 +44,7 @@ module Ci
       return error("400 Job has to be running", 400) unless job.running?
       pipeline = Ci::CreatePipelineService.new(project, job.user, ref: params[:ref])
-        .execute(:cross_project_pipeline, ignore_skip_ci: true) do |pipeline|
+        .execute(:pipeline, ignore_skip_ci: true) do |pipeline|
           source = job.sourced_pipelines.build(
             source_pipeline: job.pipeline,
             source_project: job.project,

changelogs/unreleased/118627-delete-selected-button-is-incorrectly-active-after-uploading-desig.yml

+---
+title: Fix Delete Selected button being active after uploading designs after a deletion
+merge_request: 22516
+author:
+type: fixed

changelogs/unreleased/create-downstream-pipeline-in-same-project.yml

----
-title: Allow an upstream pipeline to create a downstream pipeline in the same project
-merge_request: 20930
-author:
-type: added