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
77b0405a
Commit
77b0405a
authored
Mar 10, 2020
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Display survey on cluster page when Knative is installed
parent
9abb3dcc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
app/assets/javascripts/clusters/clusters_bundle.js
app/assets/javascripts/clusters/clusters_bundle.js
+12
-1
app/views/clusters/clusters/show.html.haml
app/views/clusters/clusters/show.html.haml
+2
-0
No files found.
app/assets/javascripts/clusters/clusters_bundle.js
View file @
77b0405a
...
...
@@ -8,13 +8,20 @@ import Flash from '../flash';
import
Poll
from
'
../lib/utils/poll
'
;
import
initSettingsPanels
from
'
../settings_panels
'
;
import
eventHub
from
'
./event_hub
'
;
import
{
APPLICATION_STATUS
,
INGRESS
,
INGRESS_DOMAIN_SUFFIX
,
CROSSPLANE
}
from
'
./constants
'
;
import
{
APPLICATION_STATUS
,
INGRESS
,
INGRESS_DOMAIN_SUFFIX
,
CROSSPLANE
,
KNATIVE
,
}
from
'
./constants
'
;
import
ClustersService
from
'
./services/clusters_service
'
;
import
ClustersStore
from
'
./stores/clusters_store
'
;
import
Applications
from
'
./components/applications.vue
'
;
import
RemoveClusterConfirmation
from
'
./components/remove_cluster_confirmation.vue
'
;
import
setupToggleButtons
from
'
../toggle_buttons
'
;
import
initProjectSelectDropdown
from
'
~/project_select
'
;
import
initServerlessSurveyBanner
from
'
~/serverless/survey_banner
'
;
const
Environments
=
()
=>
import
(
'
ee_component/clusters/components/environments.vue
'
);
...
...
@@ -326,6 +333,10 @@ export default class Clusters {
this
.
store
.
state
.
applications
[
INGRESS
],
);
}
if
(
this
.
store
.
state
.
applications
[
KNATIVE
].
status
===
APPLICATION_STATUS
.
INSTALLED
)
{
initServerlessSurveyBanner
();
}
}
showToken
()
{
...
...
app/views/clusters/clusters/show.html.haml
View file @
77b0405a
...
...
@@ -39,6 +39,8 @@
.js-cluster-application-notice
.flash-container
.js-serverless-survey-banner
{
data:
{
user_name:
current_user
.
name
,
user_email:
current_user
.
email
}
}
%h4
=
@cluster
.
name
=
render
'banner'
...
...
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