Add latest changes from gitlab-org/gitlab@master

lib/gitlab/metrics/samplers/base_sampler.rb

@@ -50,6 +50,11 @@ module Gitlab
         def start_working
           @running = true
+
+          true
+        end
+
+        def run_thread
           sleep(sleep_interval)
           while running
             safe_sample

lib/gitlab/sidekiq_daemon/memory_killer.rb

@@ -29,7 +29,7 @@ module Gitlab
       private
-      def start_working
+      def run_thread
         Sidekiq.logger.info(
           class: self.class.to_s,
           action: 'start',

lib/gitlab/sidekiq_daemon/monitor.rb

@@ -61,7 +61,7 @@ module Gitlab
       private
-      def start_working
+      def run_thread
         return unless notification_channel_enabled?
         begin

locale/gitlab.pot

@@ -8282,6 +8282,9 @@ msgstr ""
 msgid "GroupSettings|Be careful. Changing a group's parent can have unintended %{side_effects_link_start}side effects%{side_effects_link_end}."
 msgstr ""
+msgid "GroupSettings|Cannot update the path because there are projects under this group that contain Docker images in their Container Registry. Please remove the images from your projects first and try again."
+msgstr ""
+
 msgid "GroupSettings|Change group path"
 msgstr ""
@@ -17290,6 +17293,9 @@ msgstr ""
 msgid "Transfer project"
 msgstr ""
+msgid "TransferGroup|Cannot update the path because there are projects under this group that contain Docker images in their Container Registry. Please remove the images from your projects first and try again."
+msgstr ""
+
 msgid "TransferGroup|Database is not supported."
 msgstr ""

spec/controllers/groups_controller_spec.rb

@@ -385,6 +385,29 @@ describe GroupsController do
       expect(response).to have_gitlab_http_status(302)
       expect(group.reload.project_creation_level).to eq(::Gitlab::Access::MAINTAINER_PROJECT_ACCESS)
     end
+
+    context 'when a project inside the group has container repositories' do
+      before do
+        stub_container_registry_config(enabled: true)
+        stub_container_registry_tags(repository: /image/, tags: %w[rc1])
+        create(:container_repository, project: project, name: :image)
+      end
+
+      it 'does allow the group to be renamed' do
+        post :update, params: { id: group.to_param, group: { name: 'new_name' } }
+
+        expect(controller).to set_flash[:notice]
+        expect(response).to have_gitlab_http_status(302)
+        expect(group.reload.name).to eq('new_name')
+      end
+
+      it 'does not allow to path of the group to be changed' do
+        post :update, params: { id: group.to_param, group: { path: 'new_path' } }
+
+        expect(assigns(:group).errors[:base].first).to match(/Docker images in their Container Registry/)
+        expect(response).to have_gitlab_http_status(200)
+      end
+    end
   end
   describe '#ensure_canonical_path' do
@@ -673,6 +696,28 @@ describe GroupsController do
         expect(response).to have_gitlab_http_status(404)
       end
     end
+
+    context 'transferring when a project has container images' do
+      let(:group) { create(:group, :public, :nested) }
+      let!(:group_member) { create(:group_member, :owner, group: group, user: user) }
+
+      before do
+        stub_container_registry_config(enabled: true)
+        stub_container_registry_tags(repository: /image/, tags: %w[rc1])
+        create(:container_repository, project: project, name: :image)
+
+        put :transfer,
+          params: {
+            id: group.to_param,
+            new_parent_group_id: ''
+          }
+      end
+
+      it 'does not allow the group to be transferred' do
+        expect(controller).to set_flash[:alert].to match(/Docker images in their Container Registry/)
+        expect(response).to redirect_to(edit_group_path(group))
+      end
+    end
   end
   context 'token authentication' do

spec/controllers/projects/pipelines_controller_spec.rb

@@ -217,6 +217,193 @@ describe Projects::PipelinesController do
       end
     end
+    context 'with triggered pipelines' do
+      let_it_be(:project) { create(:project, :repository) }
+      let_it_be(:source_project) { create(:project, :repository) }
+      let_it_be(:target_project) { create(:project, :repository) }
+      let_it_be(:root_pipeline) { create_pipeline(project) }
+      let_it_be(:source_pipeline) { create_pipeline(source_project) }
+      let_it_be(:source_of_source_pipeline) { create_pipeline(source_project) }
+      let_it_be(:target_pipeline) { create_pipeline(target_project) }
+      let_it_be(:target_of_target_pipeline) { create_pipeline(target_project) }
+
+      before do
+        create_link(source_of_source_pipeline, source_pipeline)
+        create_link(source_pipeline, root_pipeline)
+        create_link(root_pipeline, target_pipeline)
+        create_link(target_pipeline, target_of_target_pipeline)
+      end
+
+      shared_examples 'not expanded' do
+        let(:expected_stages) { be_nil }
+
+        it 'does return base details' do
+          get_pipeline_json(root_pipeline)
+
+          expect(json_response['triggered_by']).to include('id' => source_pipeline.id)
+          expect(json_response['triggered']).to contain_exactly(
+            include('id' => target_pipeline.id))
+        end
+
+        it 'does not expand triggered_by pipeline' do
+          get_pipeline_json(root_pipeline)
+
+          triggered_by = json_response['triggered_by']
+          expect(triggered_by['triggered_by']).to be_nil
+          expect(triggered_by['triggered']).to be_nil
+          expect(triggered_by['details']['stages']).to expected_stages
+        end
+
+        it 'does not expand triggered pipelines' do
+          get_pipeline_json(root_pipeline)
+
+          first_triggered = json_response['triggered'].first
+          expect(first_triggered['triggered_by']).to be_nil
+          expect(first_triggered['triggered']).to be_nil
+          expect(first_triggered['details']['stages']).to expected_stages
+        end
+      end
+
+      shared_examples 'expanded' do
+        it 'does return base details' do
+          get_pipeline_json(root_pipeline)
+
+          expect(json_response['triggered_by']).to include('id' => source_pipeline.id)
+          expect(json_response['triggered']).to contain_exactly(
+            include('id' => target_pipeline.id))
+        end
+
+        it 'does expand triggered_by pipeline' do
+          get_pipeline_json(root_pipeline)
+
+          triggered_by = json_response['triggered_by']
+          expect(triggered_by['triggered_by']).to include(
+            'id' => source_of_source_pipeline.id)
+          expect(triggered_by['details']['stages']).not_to be_nil
+        end
+
+        it 'does not recursively expand triggered_by' do
+          get_pipeline_json(root_pipeline)
+
+          triggered_by = json_response['triggered_by']
+          expect(triggered_by['triggered']).to be_nil
+        end
+
+        it 'does expand triggered pipelines' do
+          get_pipeline_json(root_pipeline)
+
+          first_triggered = json_response['triggered'].first
+          expect(first_triggered['triggered']).to contain_exactly(
+            include('id' => target_of_target_pipeline.id))
+          expect(first_triggered['details']['stages']).not_to be_nil
+        end
+
+        it 'does not recursively expand triggered' do
+          get_pipeline_json(root_pipeline)
+
+          first_triggered = json_response['triggered'].first
+          expect(first_triggered['triggered_by']).to be_nil
+        end
+      end
+
+      context 'when it does have permission to read other projects' do
+        before do
+          source_project.add_developer(user)
+          target_project.add_developer(user)
+        end
+
+        context 'when not-expanding any pipelines' do
+          let(:expanded) { nil }
+
+          it_behaves_like 'not expanded'
+        end
+
+        context 'when expanding non-existing pipeline' do
+          let(:expanded) { [-1] }
+
+          it_behaves_like 'not expanded'
+        end
+
+        context 'when expanding pipeline that is not directly expandable' do
+          let(:expanded) { [source_of_source_pipeline.id, target_of_target_pipeline.id] }
+
+          it_behaves_like 'not expanded'
+        end
+
+        context 'when expanding self' do
+          let(:expanded) { [root_pipeline.id] }
+
+          context 'it does not recursively expand pipelines' do
+            it_behaves_like 'not expanded'
+          end
+        end
+
+        context 'when expanding source and target pipeline' do
+          let(:expanded) { [source_pipeline.id, target_pipeline.id] }
+
+          it_behaves_like 'expanded'
+
+          context 'when expand depth is limited to 1' do
+            before do
+              stub_const('TriggeredPipelineEntity::MAX_EXPAND_DEPTH', 1)
+            end
+
+            it_behaves_like 'not expanded' do
+              # We expect that triggered/triggered_by is not expanded,
+              # but we still return details.stages for that pipeline
+              let(:expected_stages) { be_a(Array) }
+            end
+          end
+        end
+
+        context 'when expanding all' do
+          let(:expanded) do
+            [
+              source_of_source_pipeline.id,
+              source_pipeline.id,
+              root_pipeline.id,
+              target_pipeline.id,
+              target_of_target_pipeline.id
+            ]
+          end
+
+          it_behaves_like 'expanded'
+        end
+      end
+
+      context 'when does not have permission to read other projects' do
+        let(:expanded) { [source_pipeline.id, target_pipeline.id] }
+
+        it_behaves_like 'not expanded'
+      end
+
+      def create_pipeline(project)
+        create(:ci_empty_pipeline, project: project).tap do |pipeline|
+          create(:ci_build, pipeline: pipeline, stage: 'test', name: 'rspec')
+        end
+      end
+
+      def create_link(source_pipeline, pipeline)
+        source_pipeline.sourced_pipelines.create!(
+          source_job: source_pipeline.builds.all.sample,
+          source_project: source_pipeline.project,
+          project: pipeline.project,
+          pipeline: pipeline
+        )
+      end
+
+      def get_pipeline_json(pipeline)
+        params = {
+          namespace_id: pipeline.project.namespace,
+          project_id: pipeline.project,
+          id: pipeline,
+          expanded: expanded
+        }
+
+        get :show, params: params.compact, format: :json
+      end
+    end
+
     def get_pipeline_json
       get :show, params: { namespace_id: project.namespace, project_id: project, id: pipeline }, format: :json
     end

spec/dependencies/omniauth_saml_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'omniauth/strategies/saml'

spec/factories/ci/sources/pipelines.rb

+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :ci_sources_pipeline, class: Ci::Sources::Pipeline do
+    after(:build) do |source|
+      source.project ||= source.pipeline.project
+      source.source_pipeline ||= source.source_job.pipeline
+      source.source_project ||= source.source_pipeline.project
+    end
+
+    source_job factory: :ci_build
+
+    pipeline factory: :ci_empty_pipeline
+  end
+end

spec/features/projects/jobs_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'tempfile'
@@ -424,8 +426,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
         it 'loads job trace' do
           expect(page).to have_content 'BUILD TRACE'
-          job.trace.write('a+b') do |stream|
-            stream.append(' and more trace', 11)
+          job.trace.write(+'a+b') do |stream|
+            stream.append(+' and more trace', 11)
           end
           expect(page).to have_content 'BUILD TRACE and more trace'

spec/finders/access_requests_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AccessRequestsFinder do

spec/finders/admin/projects_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe Admin::ProjectsFinder do

spec/finders/autocomplete/move_to_project_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe Autocomplete::MoveToProjectFinder do

spec/finders/autocomplete/users_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe Autocomplete::UsersFinder do

spec/finders/branches_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BranchesFinder do

spec/finders/clusters_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe ClustersFinder do

spec/finders/concerns/finder_methods_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe FinderMethods do

spec/finders/concerns/finder_with_cross_project_access_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe FinderWithCrossProjectAccess do

spec/finders/contributed_projects_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe ContributedProjectsFinder do

spec/finders/environments_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe EnvironmentsFinder do

spec/finders/events_finder_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe EventsFinder do