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
0a62588b
Commit
0a62588b
authored
Oct 30, 2018
by
Chris Baumbauer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix remaining domainname -> hostname rebranding
parent
6aa0645f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
5 deletions
+8
-5
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+3
-3
app/assets/javascripts/clusters/constants.js
app/assets/javascripts/clusters/constants.js
+1
-0
app/assets/javascripts/clusters/stores/clusters_store.js
app/assets/javascripts/clusters/stores/clusters_store.js
+3
-1
spec/javascripts/clusters/components/applications_spec.js
spec/javascripts/clusters/components/applications_spec.js
+1
-1
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
0a62588b
...
@@ -383,7 +383,7 @@ export default {
...
@@ -383,7 +383,7 @@ export default {
:status-reason=
"applications.knative.statusReason"
:status-reason=
"applications.knative.statusReason"
:request-status=
"applications.knative.requestStatus"
:request-status=
"applications.knative.requestStatus"
:request-reason=
"applications.knative.requestReason"
:request-reason=
"applications.knative.requestReason"
:install-application-request-params=
"{ hostname: applications.knative.
domain
name}"
:install-application-request-params=
"{ hostname: applications.knative.
host
name}"
:disabled=
"!helmInstalled"
:disabled=
"!helmInstalled"
class=
"hide-bottom-border rounded-bottom"
class=
"hide-bottom-border rounded-bottom"
title-link=
"https://github.com/knative/docs"
title-link=
"https://github.com/knative/docs"
...
@@ -405,7 +405,7 @@ export default {
...
@@ -405,7 +405,7 @@ export default {
</label>
</label>
<input
<input
id=
"knative-domainname"
id=
"knative-domainname"
v-model=
"applications.knative.
domain
name"
v-model=
"applications.knative.
host
name"
type=
"text"
type=
"text"
class=
"form-control js-domainname"
class=
"form-control js-domainname"
readonly
readonly
...
@@ -419,7 +419,7 @@ export default {
...
@@ -419,7 +419,7 @@ export default {
</label>
</label>
<input
<input
id=
"knative-domainname"
id=
"knative-domainname"
v-model=
"applications.knative.
domain
name"
v-model=
"applications.knative.
host
name"
type=
"text"
type=
"text"
class=
"form-control js-domainname"
class=
"form-control js-domainname"
/>
/>
...
...
app/assets/javascripts/clusters/constants.js
View file @
0a62588b
...
@@ -16,3 +16,4 @@ export const REQUEST_SUCCESS = 'request-success';
...
@@ -16,3 +16,4 @@ export const REQUEST_SUCCESS = 'request-success';
export
const
REQUEST_FAILURE
=
'
request-failure
'
;
export
const
REQUEST_FAILURE
=
'
request-failure
'
;
export
const
INGRESS
=
'
ingress
'
;
export
const
INGRESS
=
'
ingress
'
;
export
const
JUPYTER
=
'
jupyter
'
;
export
const
JUPYTER
=
'
jupyter
'
;
export
const
KNATIVE
=
'
knative
'
;
app/assets/javascripts/clusters/stores/clusters_store.js
View file @
0a62588b
import
{
s__
}
from
'
../../locale
'
;
import
{
s__
}
from
'
../../locale
'
;
import
{
INGRESS
,
JUPYTER
}
from
'
../constants
'
;
import
{
INGRESS
,
JUPYTER
,
KNATIVE
}
from
'
../constants
'
;
export
default
class
ClusterStore
{
export
default
class
ClusterStore
{
constructor
()
{
constructor
()
{
...
@@ -105,6 +105,8 @@ export default class ClusterStore {
...
@@ -105,6 +105,8 @@ export default class ClusterStore {
(
this
.
state
.
applications
.
ingress
.
externalIp
(
this
.
state
.
applications
.
ingress
.
externalIp
?
`jupyter.
${
this
.
state
.
applications
.
ingress
.
externalIp
}
.nip.io`
?
`jupyter.
${
this
.
state
.
applications
.
ingress
.
externalIp
}
.nip.io`
:
''
);
:
''
);
}
else
if
(
appId
===
KNATIVE
)
{
this
.
state
.
applications
.
knative
.
hostname
=
serverAppEntry
.
hostname
?
serverAppEntry
.
hostname
:
''
;
}
}
});
});
}
}
...
...
spec/javascripts/clusters/components/applications_spec.js
View file @
0a62588b
...
@@ -68,7 +68,7 @@ describe('Applications', () => {
...
@@ -68,7 +68,7 @@ describe('Applications', () => {
runner
:
{
title
:
'
GitLab Runner
'
},
runner
:
{
title
:
'
GitLab Runner
'
},
prometheus
:
{
title
:
'
Prometheus
'
},
prometheus
:
{
title
:
'
Prometheus
'
},
jupyter
:
{
title
:
'
JupyterHub
'
,
hostname
:
''
},
jupyter
:
{
title
:
'
JupyterHub
'
,
hostname
:
''
},
knative
:
{
title
:
'
Knative
'
,
domain
name
:
''
},
knative
:
{
title
:
'
Knative
'
,
host
name
:
''
},
},
},
});
});
...
...
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