Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 21 deletions

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)