Skip to content
Snippets Groups Projects
Commit 14ddfbcd authored by Phil Hughes's avatar Phil Hughes
Browse files

Merge branch '10027-folder-bundle' into 'master'

Removes EE differences for environments_folder_bundle

Closes gitlab-ee#10027

See merge request gitlab-org/gitlab-ce!26184
parents f52fe5a8 addb6d3e
No related branches found
No related tags found
No related merge requests found
import Vue from 'vue';
import canaryCalloutMixin from 'ee_else_ce/environments/mixins/canary_callout_mixin';
import environmentsFolderApp from './environments_folder_view.vue';
import { parseBoolean } from '../../lib/utils/common_utils';
import Translate from '../../vue_shared/translate';
Loading
Loading
@@ -11,6 +12,7 @@ export default () =>
components: {
environmentsFolderApp,
},
mixins: [canaryCalloutMixin],
data() {
const environmentsData = document.querySelector(this.$options.el).dataset;
 
Loading
Loading
@@ -28,6 +30,7 @@ export default () =>
folderName: this.folderName,
cssContainerClass: this.cssContainerClass,
canReadEnvironment: this.canReadEnvironment,
...this.canaryCalloutProps,
},
});
},
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment