Add latest changes from gitlab-org/gitlab@master

7 files changed, 19 insertions, 35 deletions

diff --git a/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue b/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue
index 8e8f31a4acc..96680080f0c 100644
--- a/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue
+++ b/app/assets/javascripts/pipeline_editor/pipeline_editor_home.vue
@@ -90,7 +90,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-pr-9 gl-transition-medium gl-w-full">
+  <div class="gl-pr-10 gl-transition-medium gl-w-full">
     <gl-modal
       v-if="showSwitchBranchModal"
       visible
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index 6b1ec0666f8..07ef80ef7e1 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -311,3 +311,8 @@ $gl-line-height-42: px-to-rem(42px);
     padding-right: $gl-spacing-scale-5;
   }
 }
+
+// Will be moved to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2600
+.gl-pr-10 {
+  padding-right: $gl-spacing-scale-10;
+}
diff --git a/app/helpers/packages_helper.rb b/app/helpers/packages_helper.rb
index cf97fdf73e3..402a363349f 100644
--- a/app/helpers/packages_helper.rb
+++ b/app/helpers/packages_helper.rb
@@ -55,24 +55,4 @@ module PackagesHelper
     project.container_expiration_policy.nil? &&
     project.container_repositories.exists?
   end
-
-  def package_details_data(project, package)
-    {
-      package_id: package.id,
-      can_delete: can?(current_user, :destroy_package, project).to_s,
-      svg_path: image_path('illustrations/no-packages.svg'),
-      npm_path: package_registry_instance_url(:npm),
-      npm_project_path: package_registry_project_url(project.id, :npm),
-      maven_path: package_registry_project_url(project.id, :maven),
-      conan_path: package_registry_project_url(project.id, :conan),
-      nuget_path: nuget_package_registry_url(project.id),
-      pypi_path: pypi_registry_url(project.id),
-      pypi_setup_path: package_registry_project_url(project.id, :pypi),
-      composer_path: composer_registry_url(project&.group&.id),
-      project_name: project.name,
-      project_list_url: project_packages_path(project),
-      group_list_url: project.group ? group_packages_path(project.group) : '',
-      composer_config_repository_name: composer_config_repository_name(project.group&.id)
-    }
-  end
 end
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 2729951d685..fb74a52fcda 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -125,7 +125,7 @@ module PageLayoutHelper
   end
 
   def fluid_layout
-    current_user && current_user.layout == "fluid"
+    @force_fluid_layout == true || (current_user && current_user.layout == "fluid")
   end
 
   def blank_container(enabled = false)
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 1c469377231..8b2d987ed90 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -255,18 +255,16 @@ module Ci
         Arel.sql("(#{arel_tag_names_array.to_sql})")
       ]
 
-      ::Gitlab::Database.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/339621') do
-        group(*unique_params).pluck('array_agg(ci_runners.id)', *unique_params).map do |values|
-          Gitlab::Ci::Matching::RunnerMatcher.new({
-            runner_ids: values[0],
-            runner_type: values[1],
-            public_projects_minutes_cost_factor: values[2],
-            private_projects_minutes_cost_factor: values[3],
-            run_untagged: values[4],
-            access_level: values[5],
-            tag_list: values[6]
-          })
-        end
+      group(*unique_params).pluck('array_agg(ci_runners.id)', *unique_params).map do |values|
+        Gitlab::Ci::Matching::RunnerMatcher.new({
+          runner_ids: values[0],
+          runner_type: values[1],
+          public_projects_minutes_cost_factor: values[2],
+          private_projects_minutes_cost_factor: values[3],
+          run_untagged: values[4],
+          access_level: values[5],
+          tag_list: values[6]
+        })
       end
     end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index a553246ed79..5aa4b4d9968 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -454,7 +454,7 @@ class Project < ApplicationRecord
   delegate :job_token_scope_enabled, :job_token_scope_enabled=, to: :ci_cd_settings, prefix: :ci, allow_nil: true
   delegate :keep_latest_artifact, :keep_latest_artifact=, to: :ci_cd_settings, allow_nil: true
   delegate :restrict_user_defined_variables, :restrict_user_defined_variables=, to: :ci_cd_settings, allow_nil: true
-  delegate :actual_limits, :actual_plan_name, to: :namespace, allow_nil: true
+  delegate :actual_limits, :actual_plan_name, :actual_plan, to: :namespace, allow_nil: true
   delegate :allow_merge_on_skipped_pipeline, :allow_merge_on_skipped_pipeline?,
     :allow_merge_on_skipped_pipeline=, :has_confluence?, :has_shimo?,
     to: :project_setting
diff --git a/app/views/projects/ci/pipeline_editor/show.html.haml b/app/views/projects/ci/pipeline_editor/show.html.haml
index ce6f7553ab4..c4757ea9c26 100644
--- a/app/views/projects/ci/pipeline_editor/show.html.haml
+++ b/app/views/projects/ci/pipeline_editor/show.html.haml
@@ -1,3 +1,4 @@
+- @force_fluid_layout = true
 - add_page_specific_style 'page_bundles/pipelines'
 
 - page_title s_('Pipelines|Pipeline Editor')