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
c5e1b0f9
Commit
c5e1b0f9
authored
Dec 05, 2019
by
Dhiraj Bodicherla
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved canary to constants
parent
70cea8f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
ee/app/assets/javascripts/environments/components/deploy_board_component.vue
...cripts/environments/components/deploy_board_component.vue
+3
-7
ee/app/assets/javascripts/environments/constants.js
ee/app/assets/javascripts/environments/constants.js
+6
-2
No files found.
ee/app/assets/javascripts/environments/components/deploy_board_component.vue
View file @
c5e1b0f9
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
{
GlLoadingIcon
,
GlLink
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlLink
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
deployBoardSvg
from
'
ee_empty_states/icons/_deploy_board.svg
'
;
import
deployBoardSvg
from
'
ee_empty_states/icons/_deploy_board.svg
'
;
import
{
__
,
n__
,
s__
,
sprintf
}
from
'
~/locale
'
;
import
{
n__
,
s__
,
sprintf
}
from
'
~/locale
'
;
import
STATUS_MAP
from
'
../constants
'
;
import
{
STATUS_MAP
,
CANARY_STATUS
}
from
'
../constants
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
@@ -101,11 +101,7 @@ export default {
...
@@ -101,11 +101,7 @@ export default {
// Hence adding it here.
// Hence adding it here.
return
{
return
{
...
STATUS_MAP
,
...
STATUS_MAP
,
canary
:
{
CANARY_STATUS
,
class
:
'
canary-icon
'
,
text
:
__
(
'
Canary
'
),
stable
:
false
,
},
};
};
},
},
},
},
...
...
ee/app/assets/javascripts/environments/constants.js
View file @
c5e1b0f9
...
@@ -3,7 +3,7 @@ import { __ } from '~/locale';
...
@@ -3,7 +3,7 @@ import { __ } from '~/locale';
// These statuses are based on how the backend defines pod phases here
// These statuses are based on how the backend defines pod phases here
// lib/gitlab/kubernetes/pod.rb
// lib/gitlab/kubernetes/pod.rb
const
STATUS_MAP
=
{
export
const
STATUS_MAP
=
{
succeeded
:
{
succeeded
:
{
class
:
'
succeeded
'
,
class
:
'
succeeded
'
,
text
:
__
(
'
Succeeded
'
),
text
:
__
(
'
Succeeded
'
),
...
@@ -31,4 +31,8 @@ const STATUS_MAP = {
...
@@ -31,4 +31,8 @@ const STATUS_MAP = {
},
},
};
};
export
default
STATUS_MAP
;
export
const
CANARY_STATUS
=
{
class
:
'
canary-icon
'
,
text
:
__
(
'
Canary
'
),
stable
:
false
,
};
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