Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
e6616e04
Commit
e6616e04
authored
Nov 03, 2017
by
Alessio Caiazza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos
parent
44f885ef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
14 deletions
+10
-14
app/controllers/projects/clusters/applications_controller.rb
app/controllers/projects/clusters/applications_controller.rb
+7
-11
app/services/clusters/applications/check_installation_progress_service.rb
...sters/applications/check_installation_progress_service.rb
+1
-1
app/workers/cluster_wait_for_app_installation_worker.rb
app/workers/cluster_wait_for_app_installation_worker.rb
+1
-1
config/routes/project.rb
config/routes/project.rb
+1
-1
No files found.
app/controllers/projects/clusters/applications_controller.rb
View file @
e6616e04
...
...
@@ -5,17 +5,13 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
before_action
:authorize_create_cluster!
,
only:
[
:create
]
def
create
respond_to
do
|
format
|
format
.
json
do
scheduled
=
Clusters
::
Applications
::
ScheduleInstallationService
.
new
(
project
,
current_user
,
application_class:
@application_class
,
cluster:
@cluster
).
execute
if
scheduled
head
:no_data
else
head
:bad_request
end
end
scheduled
=
Clusters
::
Applications
::
ScheduleInstallationService
.
new
(
project
,
current_user
,
application_class:
@application_class
,
cluster:
@cluster
).
execute
if
scheduled
head
:no_data
else
head
:bad_request
end
end
...
...
app/services/clusters/applications/check_installation_progress_service.rb
View file @
e6616e04
...
...
@@ -40,7 +40,7 @@ module Clusters
end
end
def
fin
i
lize_installation
def
fin
a
lize_installation
FinalizeInstallationService
.
new
(
app
).
execute
end
...
...
app/workers/cluster_wait_for_app_installation_worker.rb
View file @
e6616e04
...
...
@@ -3,7 +3,7 @@ class ClusterWaitForAppInstallationWorker
include
ClusterQueue
include
ClusterApplications
INTERVAL
=
3
0
.
seconds
INTERVAL
=
1
0
.
seconds
TIMEOUT
=
20
.
minutes
def
perform
(
app_name
,
app_id
)
...
...
config/routes/project.rb
View file @
e6616e04
...
...
@@ -192,7 +192,7 @@ constraints(ProjectUrlConstrainer.new) do
get
:status
,
format: :json
scope
:applications
do
ge
t
'/*application'
,
to:
'clusters/applications#create'
pos
t
'/*application'
,
to:
'clusters/applications#create'
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