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
f1262ebd
Commit
f1262ebd
authored
Apr 27, 2020
by
Emily Ring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved canary_callout_mixin out of EE folder
Moved canary_callout_mixin.js out of EE folder and into CE folder
parent
ac1f41a6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
29 deletions
+24
-29
app/assets/javascripts/environments/folder/environments_folder_bundle.js
...scripts/environments/folder/environments_folder_bundle.js
+1
-1
app/assets/javascripts/environments/index.js
app/assets/javascripts/environments/index.js
+1
-1
app/assets/javascripts/environments/mixins/canary_callout_mixin.js
...s/javascripts/environments/mixins/canary_callout_mixin.js
+22
-1
ee/app/assets/javascripts/environments/mixins/canary_callout_mixin.js
...s/javascripts/environments/mixins/canary_callout_mixin.js
+0
-26
No files found.
app/assets/javascripts/environments/folder/environments_folder_bundle.js
View file @
f1262ebd
import
Vue
from
'
vue
'
;
import
canaryCalloutMixin
from
'
ee_else_ce/environments
/mixins/canary_callout_mixin
'
;
import
canaryCalloutMixin
from
'
..
/mixins/canary_callout_mixin
'
;
import
environmentsFolderApp
from
'
./environments_folder_view.vue
'
;
import
{
parseBoolean
}
from
'
../../lib/utils/common_utils
'
;
import
Translate
from
'
../../vue_shared/translate
'
;
...
...
app/assets/javascripts/environments/index.js
View file @
f1262ebd
import
Vue
from
'
vue
'
;
import
canaryCalloutMixin
from
'
ee_else_ce/environments
/mixins/canary_callout_mixin
'
;
import
canaryCalloutMixin
from
'
.
/mixins/canary_callout_mixin
'
;
import
environmentsComponent
from
'
./components/environments_app.vue
'
;
import
{
parseBoolean
}
from
'
../lib/utils/common_utils
'
;
import
Translate
from
'
../vue_shared/translate
'
;
...
...
app/assets/javascripts/environments/mixins/canary_callout_mixin.js
View file @
f1262ebd
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
export
default
{
data
()
{
const
data
=
document
.
querySelector
(
this
.
$options
.
el
).
dataset
;
return
{
canaryDeploymentFeatureId
:
data
.
environmentsDataCanaryDeploymentFeatureId
,
showCanaryDeploymentCallout
:
parseBoolean
(
data
.
environmentsDataShowCanaryDeploymentCallout
),
userCalloutsPath
:
data
.
environmentsDataUserCalloutsPath
,
lockPromotionSvgPath
:
data
.
environmentsDataLockPromotionSvgPath
,
helpCanaryDeploymentsPath
:
data
.
environmentsDataHelpCanaryDeploymentsPath
,
};
},
computed
:
{
canaryCalloutProps
()
{},
canaryCalloutProps
()
{
return
{
canaryDeploymentFeatureId
:
this
.
canaryDeploymentFeatureId
,
showCanaryDeploymentCallout
:
this
.
showCanaryDeploymentCallout
,
userCalloutsPath
:
this
.
userCalloutsPath
,
lockPromotionSvgPath
:
this
.
lockPromotionSvgPath
,
helpCanaryDeploymentsPath
:
this
.
helpCanaryDeploymentsPath
,
};
},
},
};
ee/app/assets/javascripts/environments/mixins/canary_callout_mixin.js
deleted
100644 → 0
View file @
ac1f41a6
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
export
default
{
data
()
{
const
data
=
document
.
querySelector
(
this
.
$options
.
el
).
dataset
;
return
{
canaryDeploymentFeatureId
:
data
.
environmentsDataCanaryDeploymentFeatureId
,
showCanaryDeploymentCallout
:
parseBoolean
(
data
.
environmentsDataShowCanaryDeploymentCallout
),
userCalloutsPath
:
data
.
environmentsDataUserCalloutsPath
,
lockPromotionSvgPath
:
data
.
environmentsDataLockPromotionSvgPath
,
helpCanaryDeploymentsPath
:
data
.
environmentsDataHelpCanaryDeploymentsPath
,
};
},
computed
:
{
canaryCalloutProps
()
{
return
{
canaryDeploymentFeatureId
:
this
.
canaryDeploymentFeatureId
,
showCanaryDeploymentCallout
:
this
.
showCanaryDeploymentCallout
,
userCalloutsPath
:
this
.
userCalloutsPath
,
lockPromotionSvgPath
:
this
.
lockPromotionSvgPath
,
helpCanaryDeploymentsPath
:
this
.
helpCanaryDeploymentsPath
,
};
},
},
};
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