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
Léo-Paul Géneau
gitlab-ce
Commits
7a6da82a
Commit
7a6da82a
authored
Jun 29, 2018
by
Sam Beckham
Committed by
Phil Hughes
Jun 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Remove "environment scope" field on cluster creation form for core/starter plans"
parent
786cbfa1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
3 deletions
+22
-3
app/views/projects/clusters/user/_form.html.haml
app/views/projects/clusters/user/_form.html.haml
+4
-3
changelogs/unreleased/43472-remove-environment-scope-field-on-cluster-creation-form-for-core-starter-plans.yml
...field-on-cluster-creation-form-for-core-starter-plans.yml
+5
-0
spec/features/projects/clusters/gcp_spec.rb
spec/features/projects/clusters/gcp_spec.rb
+13
-0
No files found.
app/views/projects/clusters/user/_form.html.haml
View file @
7a6da82a
...
@@ -3,9 +3,10 @@
...
@@ -3,9 +3,10 @@
.form-group
.form-group
=
field
.
label
:name
,
s_
(
'ClusterIntegration|Kubernetes cluster name'
),
class:
'label-light'
=
field
.
label
:name
,
s_
(
'ClusterIntegration|Kubernetes cluster name'
),
class:
'label-light'
=
field
.
text_field
:name
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Kubernetes cluster name'
)
=
field
.
text_field
:name
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Kubernetes cluster name'
)
.form-group
-
if
has_multiple_clusters?
(
@project
)
=
field
.
label
:environment_scope
,
s_
(
'ClusterIntegration|Environment scope'
),
class:
'label-light'
.form-group
=
field
.
text_field
:environment_scope
,
class:
'form-control'
,
readonly:
!
has_multiple_clusters?
(
@project
),
placeholder:
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
label
:environment_scope
,
s_
(
'ClusterIntegration|Environment scope'
),
class:
'label-light'
=
field
.
text_field
:environment_scope
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
fields_for
:platform_kubernetes
,
@cluster
.
platform_kubernetes
do
|
platform_kubernetes_field
|
=
field
.
fields_for
:platform_kubernetes
,
@cluster
.
platform_kubernetes
do
|
platform_kubernetes_field
|
.form-group
.form-group
...
...
changelogs/unreleased/43472-remove-environment-scope-field-on-cluster-creation-form-for-core-starter-plans.yml
0 → 100644
View file @
7a6da82a
---
title
:
Removes the environment scope field for users that cannot edit it
merge_request
:
19643
author
:
type
:
changed
spec/features/projects/clusters/gcp_spec.rb
View file @
7a6da82a
...
@@ -157,6 +157,19 @@ feature 'Gcp Cluster', :js do
...
@@ -157,6 +157,19 @@ feature 'Gcp Cluster', :js do
end
end
end
end
context
'when a user cannot edit the environment scope'
do
before
do
visit
project_clusters_path
(
project
)
click_link
'Add Kubernetes cluster'
click_link
'Add an existing Kubernetes cluster'
end
it
'user does not see the "Environment scope" field'
do
expect
(
page
).
not_to
have_css
(
'#cluster_environment_scope'
)
end
end
context
'when user has not dismissed GCP signup offer'
do
context
'when user has not dismissed GCP signup offer'
do
before
do
before
do
visit
project_clusters_path
(
project
)
visit
project_clusters_path
(
project
)
...
...
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