summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2017-12-16 05:31:53 +0100
committerMatija Čupić <matteeyah@gmail.com>2017-12-16 05:31:53 +0100
commit6c0fd3c22dc767d8d4d90fa0a008874098a6f22c (patch)
tree4d224ad66c7f1872aebe07f494acf9572e3a11ae
parent914260930f800342c495114f507947ae35471e80 (diff)
downloadgitlab-ce-6c0fd3c22dc767d8d4d90fa0a008874098a6f22c.tar.gz
Handle html format in addition to json
-rw-r--r--app/controllers/projects/clusters/gcp_controller.rb2
-rw-r--r--config/routes/project.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb
index 95c947001a3..34d4fd7d7ca 100644
--- a/app/controllers/projects/clusters/gcp_controller.rb
+++ b/app/controllers/projects/clusters/gcp_controller.rb
@@ -27,6 +27,8 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
render json: { billing: redis.get(CheckGcpProjectBillingWorker.redis_shared_state_key_for(token_in_session)) }
end
end
+
+ format.html { render :check }
end
end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 26eb4fbeda3..9fbd0476bb8 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -189,9 +189,9 @@ constraints(ProjectUrlConstrainer.new) do
get '/user/new', to: 'clusters/user#new'
post '/user', to: 'clusters/user#create'
- get '/gcp/check', to: 'clusters/gcp#check'
get '/gcp/new', to: 'clusters/gcp#new'
get '/gcp/login', to: 'clusters/gcp#login'
+ get '/gcp/check', to: 'clusters/gcp#check'
post '/gcp', to: 'clusters/gcp#create'
end
end