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
e236d988
Commit
e236d988
authored
Mar 14, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes EE differences for environments index
parent
811641dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
14 deletions
+19
-14
app/assets/javascripts/environments/index.js
app/assets/javascripts/environments/index.js
+3
-14
app/assets/javascripts/environments/mixins/canary_callout_mixin.js
...s/javascripts/environments/mixins/canary_callout_mixin.js
+5
-0
ee/app/assets/javascripts/environments/mixins/canary_callout_mixin.js
...s/javascripts/environments/mixins/canary_callout_mixin.js
+11
-0
No files found.
app/assets/javascripts/environments/index.js
View file @
e236d988
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
canaryCalloutMixin
from
'
ee_else_ce/environments/mixins/canary_callout_mixin
'
;
import
environmentsComponent
from
'
./components/environments_app.vue
'
;
import
environmentsComponent
from
'
./components/environments_app.vue
'
;
import
{
parseBoolean
}
from
'
../lib/utils/common_utils
'
;
import
{
parseBoolean
}
from
'
../lib/utils/common_utils
'
;
import
Translate
from
'
../vue_shared/translate
'
;
import
Translate
from
'
../vue_shared/translate
'
;
// ee-only start
import
CanaryCalloutMixin
from
'
ee/environments/mixins/canary_callout_mixin
'
;
// eslint-disable-line import/order
// ee-only end
Vue
.
use
(
Translate
);
Vue
.
use
(
Translate
);
export
default
()
=>
export
default
()
=>
...
@@ -15,9 +12,7 @@ export default () =>
...
@@ -15,9 +12,7 @@ export default () =>
components
:
{
components
:
{
environmentsComponent
,
environmentsComponent
,
},
},
// ee-only start
mixins
:
[
canaryCalloutMixin
],
mixins
:
[
CanaryCalloutMixin
],
// ee-only end
data
()
{
data
()
{
const
environmentsData
=
document
.
querySelector
(
this
.
$options
.
el
).
dataset
;
const
environmentsData
=
document
.
querySelector
(
this
.
$options
.
el
).
dataset
;
...
@@ -39,13 +34,7 @@ export default () =>
...
@@ -39,13 +34,7 @@ export default () =>
cssContainerClass
:
this
.
cssContainerClass
,
cssContainerClass
:
this
.
cssContainerClass
,
canCreateEnvironment
:
this
.
canCreateEnvironment
,
canCreateEnvironment
:
this
.
canCreateEnvironment
,
canReadEnvironment
:
this
.
canReadEnvironment
,
canReadEnvironment
:
this
.
canReadEnvironment
,
// ee-only start
...
this
.
canaryCalloutProps
,
canaryDeploymentFeatureId
:
this
.
canaryDeploymentFeatureId
,
showCanaryDeploymentCallout
:
this
.
showCanaryDeploymentCallout
,
userCalloutsPath
:
this
.
userCalloutsPath
,
lockPromotionSvgPath
:
this
.
lockPromotionSvgPath
,
helpCanaryDeploymentsPath
:
this
.
helpCanaryDeploymentsPath
,
// ee-only end
},
},
});
});
},
},
...
...
app/assets/javascripts/environments/mixins/canary_callout_mixin.js
0 → 100644
View file @
e236d988
export
default
{
computed
:
{
canaryCalloutProps
()
{},
},
};
ee/app/assets/javascripts/environments/mixins/canary_callout_mixin.js
View file @
e236d988
...
@@ -12,4 +12,15 @@ export default {
...
@@ -12,4 +12,15 @@ export default {
helpCanaryDeploymentsPath
:
data
.
environmentsDataHelpCanaryDeploymentsPath
,
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