BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6c0fd3c2
Unverified
Commit
6c0fd3c2
authored
Dec 16, 2017
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle html format in addition to json
parent
91426093
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
gcp_controller.rb
app/controllers/projects/clusters/gcp_controller.rb
+2
-0
project.rb
config/routes/project.rb
+1
-1
No files found.
app/controllers/projects/clusters/gcp_controller.rb
View file @
6c0fd3c2
...
@@ -27,6 +27,8 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
...
@@ -27,6 +27,8 @@ class Projects::Clusters::GcpController < Projects::ApplicationController
render
json:
{
billing:
redis
.
get
(
CheckGcpProjectBillingWorker
.
redis_shared_state_key_for
(
token_in_session
))
}
render
json:
{
billing:
redis
.
get
(
CheckGcpProjectBillingWorker
.
redis_shared_state_key_for
(
token_in_session
))
}
end
end
end
end
format
.
html
{
render
:check
}
end
end
end
end
...
...
config/routes/project.rb
View file @
6c0fd3c2
...
@@ -189,9 +189,9 @@ constraints(ProjectUrlConstrainer.new) do
...
@@ -189,9 +189,9 @@ constraints(ProjectUrlConstrainer.new) do
get
'/user/new'
,
to:
'clusters/user#new'
get
'/user/new'
,
to:
'clusters/user#new'
post
'/user'
,
to:
'clusters/user#create'
post
'/user'
,
to:
'clusters/user#create'
get
'/gcp/check'
,
to:
'clusters/gcp#check'
get
'/gcp/new'
,
to:
'clusters/gcp#new'
get
'/gcp/new'
,
to:
'clusters/gcp#new'
get
'/gcp/login'
,
to:
'clusters/gcp#login'
get
'/gcp/login'
,
to:
'clusters/gcp#login'
get
'/gcp/check'
,
to:
'clusters/gcp#check'
post
'/gcp'
,
to:
'clusters/gcp#create'
post
'/gcp'
,
to:
'clusters/gcp#create'
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment