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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a90478c6
Commit
a90478c6
authored
Oct 06, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failures
parent
5c831e47
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
11 deletions
+5
-11
app/serializers/rollout_status_entity.rb
app/serializers/rollout_status_entity.rb
+1
-3
ee/app/models/concerns/ee/kubernetes_service.rb
ee/app/models/concerns/ee/kubernetes_service.rb
+2
-2
lib/gitlab/kubernetes/rollout_status.rb
lib/gitlab/kubernetes/rollout_status.rb
+0
-4
spec/lib/gitlab/kubernetes/rollout_status_spec.rb
spec/lib/gitlab/kubernetes/rollout_status_spec.rb
+2
-2
No files found.
app/serializers/rollout_status_entity.rb
View file @
a90478c6
...
...
@@ -5,7 +5,5 @@ class RolloutStatusEntity < Grape::Entity
expose
:instances
,
if:
->
(
rollout_status
,
_
)
{
rollout_status
.
found?
}
expose
:completion
,
if:
->
(
rollout_status
,
_
)
{
rollout_status
.
found?
}
expose
:is_completed
,
if:
->
(
rollout_status
,
_
)
{
rollout_status
.
found?
}
do
|
rollout_status
|
rollout_status
.
complete?
end
expose
:complete?
,
as: :is_completed
,
if:
->
(
rollout_status
,
_
)
{
rollout_status
.
found?
}
end
ee/app/models/concerns/ee/kubernetes_service.rb
View file @
a90478c6
...
...
@@ -20,8 +20,8 @@ module EE
super
Gitlab
::
EtagCaching
::
Store
.
new
.
tap
do
|
store
|
store
.
touch
(
Gitlab
::
Routing
.
url_helpers
.
project_environments_path
(
project
,
format: :json
))
store
.
touch
(
Gitlab
::
Routing
.
url_helpers
.
project_environments_path
(
project
,
format: :json
))
end
end
...
...
lib/gitlab/kubernetes/rollout_status.rb
View file @
a90478c6
...
...
@@ -12,10 +12,6 @@ module Gitlab
completion
==
100
end
def
status
@status
end
def
loading?
@status
==
:loading
end
...
...
spec/lib/gitlab/kubernetes/rollout_status_spec.rb
View file @
a90478c6
...
...
@@ -118,8 +118,8 @@ describe Gitlab::Kubernetes::RolloutStatus do
end
end
describe
'.loading
_rollout
'
do
subject
{
described_class
.
loading
_rollout
}
describe
'.loading'
do
subject
{
described_class
.
loading
}
it
{
is_expected
.
to
be_loading
}
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