Commit 36bca0a7 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'winh-ee-environment-variable-ee' into 'master'

Rename environment variable EE to IS_GITLAB_EE (EE-port)

Closes gitlab-ce#60080

See merge request gitlab-org/gitlab-ee!10616
parents f6ce7efd 8a0ffcfb
......@@ -4,6 +4,6 @@ const path = require('path');
const ROOT_PATH = path.resolve(__dirname, '../..');
module.exports =
process.env.EE !== undefined
? JSON.parse(process.env.EE)
process.env.IS_GITLAB_EE !== undefined
? JSON.parse(process.env.IS_GITLAB_EE)
: fs.existsSync(path.join(ROOT_PATH, 'ee'));
......@@ -322,7 +322,7 @@ module.exports = {
}),
new webpack.DefinePlugin({
'process.env.EE': JSON.stringify(IS_EE),
'process.env.IS_GITLAB_EE': JSON.stringify(IS_EE),
}),
].filter(Boolean),
......
......@@ -69,7 +69,7 @@ window.gl = window.gl || {};
window.gl.TEST_HOST = TEST_HOST;
window.gon = window.gon || {};
window.gon.test_env = true;
window.gon.ee = process.env.EE;
window.gon.ee = process.env.IS_GITLAB_EE;
gon.relative_url_root = '';
let hasUnhandledPromiseRejections = false;
......@@ -124,7 +124,7 @@ const axiosDefaultAdapter = getDefaultAdapter();
// render all of our tests
const testContexts = [require.context('spec', true, /_spec$/)];
if (process.env.EE) {
if (process.env.IS_GITLAB_EE) {
testContexts.push(require.context('ee_spec', true, /_spec$/));
}
......@@ -213,7 +213,7 @@ if (process.env.BABEL_ENV === 'coverage') {
describe('Uncovered files', function() {
const sourceFilesContexts = [require.context('~', true, /\.(js|vue)$/)];
if (process.env.EE) {
if (process.env.IS_GITLAB_EE) {
sourceFilesContexts.push(require.context('ee', true, /\.(js|vue)$/));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment