diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-17 20:15:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-17 20:15:21 +0300 |
| commit | 76044a792737e4b966be861b68947d289539c66e (patch) | |
| tree | 6355ac9d8b54beb5e6e0fd8fe6d28a464f8a5395 /app/controllers/groups | |
| parent | f63ce3000c16c04b7a7d5200c5da7c07b9af0cf2 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-ee
Diffstat (limited to 'app/controllers/groups')
4 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/groups/application_controller.rb b/app/controllers/groups/application_controller.rb index f6c71ac8087..69081835c4d 100644 --- a/app/controllers/groups/application_controller.rb +++ b/app/controllers/groups/application_controller.rb @@ -24,7 +24,7 @@ class Groups::ApplicationController < ApplicationController end def group - @group ||= find_routable!(Group, params[:group_id] || params[:id]) + @group ||= find_routable!(Group, params[:group_id] || params[:id], request.path_info) end def group_projects diff --git a/app/controllers/groups/clusters/applications_controller.rb b/app/controllers/groups/clusters/applications_controller.rb index 8dd8a01cf40..ce6fda4143c 100644 --- a/app/controllers/groups/clusters/applications_controller.rb +++ b/app/controllers/groups/clusters/applications_controller.rb @@ -13,6 +13,6 @@ class Groups::Clusters::ApplicationsController < Clusters::ApplicationsControlle end def group - @group ||= find_routable!(Group, params[:group_id] || params[:id]) + @group ||= find_routable!(Group, params[:group_id] || params[:id], request.path_info) end end diff --git a/app/controllers/groups/clusters/integrations_controller.rb b/app/controllers/groups/clusters/integrations_controller.rb index e8c8a14c164..61b308f7d1b 100644 --- a/app/controllers/groups/clusters/integrations_controller.rb +++ b/app/controllers/groups/clusters/integrations_controller.rb @@ -13,6 +13,6 @@ class Groups::Clusters::IntegrationsController < Clusters::IntegrationsControlle end def group - @group ||= find_routable!(Group, params[:group_id] || params[:id]) + @group ||= find_routable!(Group, params[:group_id] || params[:id], request.path_info) end end diff --git a/app/controllers/groups/clusters_controller.rb b/app/controllers/groups/clusters_controller.rb index 33bfc24885f..6f3eecf8296 100644 --- a/app/controllers/groups/clusters_controller.rb +++ b/app/controllers/groups/clusters_controller.rb @@ -15,7 +15,7 @@ class Groups::ClustersController < Clusters::ClustersController end def group - @group ||= find_routable!(Group, params[:group_id] || params[:id]) + @group ||= find_routable!(Group, params[:group_id] || params[:id], request.path_info) end def metrics_dashboard_params |