From c657078ecb4bff69e58f6911713e143c99f2c71f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 3 Dec 2021 03:14:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/google_cloud/base_controller.rb | 2 +- app/controllers/projects/google_cloud/service_accounts_controller.rb | 5 +++-- app/controllers/projects/google_cloud_controller.rb | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/projects/google_cloud/base_controller.rb b/app/controllers/projects/google_cloud/base_controller.rb index 8bfe5c9c5f3..aff305ab7d6 100644 --- a/app/controllers/projects/google_cloud/base_controller.rb +++ b/app/controllers/projects/google_cloud/base_controller.rb @@ -21,6 +21,6 @@ class Projects::GoogleCloud::BaseController < Projects::ApplicationController end def feature_flag_enabled! - access_denied! unless Feature.enabled?(:incubation_5mp_google_cloud) + access_denied! unless Feature.enabled?(:incubation_5mp_google_cloud, project) end end diff --git a/app/controllers/projects/google_cloud/service_accounts_controller.rb b/app/controllers/projects/google_cloud/service_accounts_controller.rb index 21b096a6c66..d5db4fabf88 100644 --- a/app/controllers/projects/google_cloud/service_accounts_controller.rb +++ b/app/controllers/projects/google_cloud/service_accounts_controller.rb @@ -9,10 +9,11 @@ class Projects::GoogleCloud::ServiceAccountsController < Projects::GoogleCloud:: gcp_projects = google_api_client.list_projects if gcp_projects.empty? - @js_data = {}.to_json + @js_data = { screen: 'no_gcp_projects' }.to_json render status: :unauthorized, template: 'projects/google_cloud/errors/no_gcp_projects' else @js_data = { + screen: 'service_accounts_form', gcpProjects: gcp_projects, environments: project.environments, cancelPath: project_google_cloud_index_path(project) @@ -78,7 +79,7 @@ class Projects::GoogleCloud::ServiceAccountsController < Projects::GoogleCloud:: def handle_gcp_error(error, project) Gitlab::ErrorTracking.track_exception(error, project_id: project.id) - @js_data = { error: error.to_s }.to_json + @js_data = { screen: 'gcp_error', error: error.to_s }.to_json render status: :unauthorized, template: 'projects/google_cloud/errors/gcp_error' end end diff --git a/app/controllers/projects/google_cloud_controller.rb b/app/controllers/projects/google_cloud_controller.rb index 6cc67391d6c..1fa8ae60376 100644 --- a/app/controllers/projects/google_cloud_controller.rb +++ b/app/controllers/projects/google_cloud_controller.rb @@ -3,6 +3,7 @@ class Projects::GoogleCloudController < Projects::GoogleCloud::BaseController def index @js_data = { + screen: 'home', serviceAccounts: GoogleCloud::ServiceAccountsService.new(project).find_for_project, createServiceAccountUrl: project_google_cloud_service_accounts_path(project), emptyIllustrationUrl: ActionController::Base.helpers.image_path('illustrations/pipelines_empty.svg') -- cgit v1.2.3