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
18ac8acb
Commit
18ac8acb
authored
Nov 08, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '38464-k8s-apps' of
https://gitlab.com/gitlab-org/gitlab-ce
into 38464-k8s-apps
parents
c3b79df7
1471495e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
lib/gitlab/kubernetes/namespace.rb
lib/gitlab/kubernetes/namespace.rb
+1
-1
spec/controllers/projects/clusters/applications_controller_spec.rb
...rollers/projects/clusters/applications_controller_spec.rb
+2
-3
No files found.
lib/gitlab/kubernetes/namespace.rb
View file @
18ac8acb
...
@@ -4,7 +4,7 @@ module Gitlab
...
@@ -4,7 +4,7 @@ module Gitlab
attr_accessor
:name
attr_accessor
:name
def
initialize
(
name
,
client
)
def
initialize
(
name
,
client
)
self
.
name
=
name
@
name
=
name
@client
=
client
@client
=
client
end
end
...
...
spec/controllers/projects/clusters/applications_controller_spec.rb
View file @
18ac8acb
...
@@ -8,7 +8,7 @@ describe Projects::Clusters::ApplicationsController do
...
@@ -8,7 +8,7 @@ describe Projects::Clusters::ApplicationsController do
end
end
describe
'POST create'
do
describe
'POST create'
do
let
(
:cluster
)
{
create
(
:cluster
,
:project
,
:provid
ing
_by_gcp
)
}
let
(
:cluster
)
{
create
(
:cluster
,
:project
,
:provid
ed
_by_gcp
)
}
let
(
:project
)
{
cluster
.
project
}
let
(
:project
)
{
cluster
.
project
}
let
(
:application
)
{
'helm'
}
let
(
:application
)
{
'helm'
}
let
(
:params
)
{
{
application:
application
,
id:
cluster
.
id
}
}
let
(
:params
)
{
{
application:
application
,
id:
cluster
.
id
}
}
...
@@ -52,8 +52,7 @@ describe Projects::Clusters::ApplicationsController do
...
@@ -52,8 +52,7 @@ describe Projects::Clusters::ApplicationsController do
context
'when application is already installing'
do
context
'when application is already installing'
do
before
do
before
do
other
=
current_application
.
new
(
cluster:
cluster
)
create
(
:cluster_applications_helm
,
:installing
,
cluster:
cluster
)
other
.
make_installing!
end
end
it
'returns 400'
do
it
'returns 400'
do
...
...
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